[evolution/wip/gsettings] Updated Serbian translation



commit f5c7a18a81b3ad5a3248bfeebbfd125743ebda7c
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Sun Jun 12 12:11:18 2011 +0200

    Updated Serbian translation

 po/sr.po       | 7127 +++++++++++++++++++++++++++-----------------------------
 po/sr latin po | 6941 ++++++++++++++++++++++++++-----------------------------
 2 files changed, 6697 insertions(+), 7371 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 60e8e15..b87b2fd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,26 +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:567
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2010-08-12 05:37+0000\n"
-"PO-Revision-Date: 2010-09-22 15:01+0200\n"
-"Last-Translator: ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>\n"
+"product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-05-17 10:54+0000\n"
+"PO-Revision-Date: 2011-06-06 09:35+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: Serbian (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-Generator: Virtaal 0.5.2\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -41,15 +42,15 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "ÐÐÑÐÑÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ."
+msgstr "ÐÐÑÐÑÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
-msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑ."
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
@@ -67,11 +68,11 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐ LDAP ÑÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑ."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
@@ -79,17 +80,16 @@ msgid ""
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÑÐ ÑÐÐÐ ÑÐÑÑÐÐÑÐÐÐ ÐÐÑÐÑÐÑÑ GroupWise. "
-"ÐÐÑÐÑÑÐÑÐ ÐÐÐÐ ÐÑÑÐÐ GroupWise ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÑÑ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ "
-"GroupWise ÑÐÑÑÐ ÐÐÐÑÐÐÑÐ Ð ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐ."
+"ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÑÐ ÑÐÐÐ ÑÐÑÑÐÐÑÐÐÐ ÐÐÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑÐÐ. "
+"ÐÐÑÐÑÑÐÑÐ ÐÐÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÑÐ "
+"ÑÐÑÑÐ ÐÐÐÑÐÐÑÐ Ð ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐÐÑÐÐ."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÑ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÑÐÑ â{0}â?"
 
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
-#| msgid "Do not delete"
 msgid "Do _Not Delete"
 msgstr "ÐÐ _ÐÑÐÑÐ"
 
@@ -99,25 +99,25 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÑÑ {0} Ñ {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ LDAP ÑÐÑÐÐÑ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐÐÑ"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "ÐÑÐÐÑÐÑÐ GroupWise ÐÐÑÐÑÐÑÐ:"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ:"
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐÐ."
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
-msgstr "ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑÑ."
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
@@ -127,8 +127,8 @@ msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐÑÐÑ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑ
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
-"ÐÐÐÐÐ ÐÐÑÑ ÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ Ð "
-"ÑÐÑÑÐÐÑÐ?"
+"ÐÐÐÐÐ ÐÐÑÑ ÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑ ÐÑÐÐÐÐÐÑÐ "
+"ÐÐÐÐÑÐÐÑ Ð ÐÐ ÑÐ ÑÐÑÑÐÐÑÐ?"
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid ""
@@ -136,9 +136,9 @@ msgid ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
-"ÐÐÐÑ LDAP ÑÐÑÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÑÐ ÑÑÐÑÐÑÑ ÐÐÑÐÐÑÑ LDAP-Ð ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ "
-"ÐÐÐÑÑÐÐÑÑ, ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐ. ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÑÑÐÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÐ ÐÐ "
-"ÐÑÐÑÑÐÐÑ."
+"ÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÑÐ ÑÑÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ "
+"ÐÐÐÑÑÐÐÑÑ, ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐ. ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÑÑÐÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÐ "
+"ÐÑÐÑÑÐÐÐ."
 
 # ÐÐÐÐ ÐÐÑÐÑÑÐ ;-)
 #: ../addressbook/addressbook.error.xml.h:23
@@ -164,11 +164,11 @@ msgstr "ÐÐÐÑ ÐÐÑÐÑÐÑ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐÐÑÐÐ."
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
-msgstr "ÐÐÐÑ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ LDAPv3 ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÑ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ3 ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
-msgstr "ÐÐÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
@@ -176,11 +176,11 @@ msgstr "ÐÑÐÑÑÐÐÐ ÐÐÑÐ ÐÐÐÑÑÐ."
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ {0}."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ {0}."
 
 #: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ?"
 
 #: ../addressbook/addressbook.error.xml.h:32
 msgid ""
@@ -196,8 +196,8 @@ msgid ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
-"ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ GroupWise ÑÐÑÐÐÑ ÑÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ "
-"ÑÐÐÑ ÐÐÐÐÑÑÐÑÐ. ÐÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÑÐÐÑ ÐÑÐÐ ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÑÑ"
+"ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ ÑÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ "
+"ÑÐÐÑ ÐÐÐÐÑÑÐÑÐ. ÐÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÑÐÐÑ ÐÑÐÐ ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÑÑ."
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
@@ -207,7 +207,7 @@ msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÑÐ ÐÐ
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÑÐÐÐÐÐ?"
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÑÐÐÑ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ?"
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -239,7 +239,7 @@ msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐ ÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../calendar/gui/e-calendar-view.c:2024
 msgid "Anniversary"
 msgstr "_ÐÐÐÐÑÑÐÑÐ:"
 
@@ -250,19 +250,18 @@ msgstr "_ÐÐÐÐÑÑÐÑÐ:"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../calendar/gui/e-calendar-view.c:2023 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:132
 msgid "Birthday"
 msgstr "_ÐÐÑÐÐÐÐÐ:"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "Blog"
 msgid "Blog:"
 msgstr "ÐÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ..."
@@ -277,9 +276,9 @@ msgid "Contact"
 msgstr "ÐÐÐÑÐÐÑ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ"
 
@@ -302,14 +301,14 @@ msgid "Full _Name..."
 msgstr "ÐÑÐÐ _ÐÐÐ..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 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"
@@ -317,7 +316,7 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
-msgstr "ÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÑÑÐÐ ÐÐÑÑÐÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
@@ -345,10 +344,10 @@ msgid "Notes"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "Other"
 msgstr "ÐÑÑÐÐ"
 
@@ -369,12 +368,11 @@ msgid "Web Addresses"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#| msgid "Web Addresses"
 msgid "Web addresses"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -397,13 +395,12 @@ msgid "_Birthday:"
 msgstr "_ÐÐÑÐÐÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#| msgid "Blog"
 msgid "_Blog:"
 msgstr "_ÐÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_ÐÐÐÐÐÐÐÑ:"
@@ -471,7 +468,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
@@ -482,74 +479,74 @@ msgstr "_ÐÐÐ:"
 msgid "_Zip/Postal Code:"
 msgstr "ÐÐÑ_ÑÐÐÑÐÐ ÐÑÐÑ:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
-msgstr "AIM"
+msgstr "ÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "ÐÐÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
-msgstr "Yahoo"
+msgstr "ÐÐÑÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+msgstr "ÐÐÐÑ-ÐÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
-msgstr "MSN"
+msgstr "ÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
-msgstr "ICQ"
+msgstr "ÐÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
-msgstr "GroupWise"
+msgstr "ÐÑÐÑÐÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "ÐÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÑÐÑÑ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ - %s"
+msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ â %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "_ÐÐÐ ÑÐÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -557,23 +554,23 @@ msgstr ""
 "ÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÑÑ ÐÐÑÑ ÐÑÐÑÐÐÐÐ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr "â%sâ ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑ"
+msgstr "â%sâ ÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "%sâ%sâ ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑ"
+msgstr "%sâ%sâ ÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ%sâ ÑÐ ÐÑÐÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑ."
 
@@ -663,7 +660,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:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
@@ -686,32 +683,32 @@ 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:760
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "_ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÑÑ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÑÐÑÑ ÐÐÑÑÐ"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÑ:"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ:"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
@@ -727,8 +724,8 @@ msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ.  "
-"ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÐ?"
+"ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ.  ÐÐ ÐÐ "
+"ÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÐ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -744,7 +741,7 @@ 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:241
@@ -764,7 +761,7 @@ msgstr "ÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑ"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 #: ../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
@@ -772,12 +769,12 @@ msgid "Any field contains"
 msgstr "ÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "Ð-ÐÐÑÑÐ ÐÐÑÐÑÐ ÑÐ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "ÐÐÐ ÑÐÐÑÐÐ"
 
@@ -800,7 +797,7 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
-msgstr "ÐÑÐÑÑÐÐÐ ÐÑÐÐÐÐÑÑÐ"
+msgstr "ÐÑÐÑÑÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
@@ -819,9 +816,9 @@ msgid "Paste contacts from the clipboard"
 msgstr "ÐÐÐÑÑÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:644
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
@@ -829,16 +826,16 @@ msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÑ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÑ ÐÐÐÑÐÐÑÐ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, 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:1309
 msgid "Are you sure you want to delete these contacts?"
@@ -900,7 +897,7 @@ msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../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
@@ -950,7 +947,7 @@ 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"
@@ -1019,7 +1016,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"
@@ -1035,7 +1032,7 @@ msgstr "ÐÐÐÐÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
-msgstr "ÐÐÐ ÑÑÑÐÐÐ"
+msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
@@ -1059,7 +1056,7 @@ msgstr ""
 "\n"
 "ÐÐÑÑÐÐÐÑÐ ÐÐÐÑÐÐÑ\n"
 "\n"
-"ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÑÐÐÑÐ."
+"ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑ."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
@@ -1145,7 +1142,7 @@ msgstr "ÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
-msgstr "ÐÐÐÑÐÐÑ ÐÐÑÑÐ: "
+msgstr "ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
@@ -1160,17 +1157,17 @@ msgid "Copy _Email Address"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÑ _ÐÐÑÐÑÑ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:391
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "ÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÑ ÐÐÑÐÑÑ"
 
@@ -1209,12 +1206,12 @@ msgstr "_ÐÐÐÐÐ ÑÐÐÐÐÐÐÑ:"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:491
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:498
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "ÐÐÐÐÐÐÐÑ"
 
@@ -1256,15 +1253,15 @@ msgstr "_ÐÐÐ ÐÐÐ:"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:115
-#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../capplet/settings/mail-capplet-shell.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-cal-shell-migrate.c:157
 #: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-memo-shell-migrate.c:115
 #: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../modules/calendar/e-task-shell-migrate.c:124
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
@@ -1282,12 +1279,12 @@ msgid "Blog"
 msgstr "ÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1297,49 +1294,49 @@ msgstr ""
 "ÐÐÑÐÑÑÐÑÐ ÐÐÐ ÐÑÐÐÐ ÐÐÐ ÐÐ ÑÐÑ ÐÐÑÐ ÐÑÐÑÐÐÑ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ. ÐÑÐÑÐÑÑÐ "
 "ÐÐÑÐÑÐÑ ÐÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÐÐÐÐÐ ÑÐÐÑÐÐÑÐ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:81
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ.  ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÑÑÐÑÐ %s ÐÐÑÑÐÑÐ Ð ÐÐ "
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ.  ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÑÑÐÑÐ %s Ð ÐÐ ÐÐ "
 "ÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÑÑÑÐÐ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 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:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "ÐÐÑÐÑÐ ÐÑÐÑÐÐ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 msgstr ""
-"ÐÑÐÑ ÐÐÑÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÑÐ ÐÐ ÐÐÑÐ ÑÐ ÑÐÑÐÐÑ \n"
-"ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ.\n"
+"ÐÑÐÑ ÐÐÑÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÑÑ ÑÐÐÑÑ ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÑÐ ÐÐ ÐÐÑÐ ÑÐ ÑÐÑÐÐÑ \n"
+"ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ.\n"
 "ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÑÐ ÑÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÑÐ ÐÐÑÐÐÐÑÐÑÐ\n"
 "ÐÑÐÑÐ ÑÐÐÑÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1347,57 +1344,54 @@ msgid ""
 "preferences for this address book."
 msgstr ""
 "ÐÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐ ÑÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐÐ\n"
-"ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ. ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÑÐ\n"
+"ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ. ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÑÐ\n"
 "ÑÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐÐÐÐ ÑÐÑÐÐÑÐ\n"
 "ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
-#| msgid "The backend for this address book was unable to parse this query."
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÐÑ ÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐ ÑÐÐÑ. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
-#| msgid "The backend for this address book refused to perform this query."
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÐÑ ÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÑ ÑÐÐÑ. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
-#| msgid "This query did not complete successfully."
 msgid "This query did not complete successfully. %s"
 msgstr "ÐÐÐÑ ÑÐÐÑ ÐÐÑÐ ÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐ. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:287
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "ÐÐÑÑÐ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:414
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑ Ñ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:416
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑ Ñ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑÐ Ñ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:421
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ"
 
@@ -1411,39 +1405,39 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐ"
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "ÐÐÐÐÐÑÐ..."
+msgstr "ÐÐÐÐÐÐ..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook CSV ÐÐÐ Tab (.csv, .tab)"
+msgstr "ÐÑÑÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV Ð Tab ÑÐÐÐÐÐÐ"
+msgstr "ÐÑÑÐÑÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozilla CSV ÐÐÐ Tab (.csv, .tab)"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
-msgstr "ÐÐÐÐÐÐ CSV Ð Tab ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "ÐÐÐÐÑÑÐÑÐ CSV ÐÐÐ Tab (.csv, .tab)"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
-msgstr "ÐÐÐÐÑÑÐÑÐÐ CSV Ð Tab ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (.ldif)"
+msgstr "ÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (.ldif)"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ LDIF ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
@@ -1451,97 +1445,96 @@ msgstr "ÐÐÐÑÑÐ (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:624
 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:746
 #, c-format
-#| msgid "Page %d of %d"
 msgid "Page %d"
-msgstr "%d. ÑÑÑÐÐÐÑÐ"
+msgstr "%d ÑÑÑÐÐÐÑÐ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
-msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÑ ÐÐÑÐÑÐÑÐ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ ÑÐÐÑÑÐ ÑÑÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "ÐÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
-msgstr "ÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐ ÐÐÐ ÐÐÐÑÑÑ ÐÐÐ csv ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÐ ÐÐÐ ÐÐÐÑÑÑ ÐÐÐ ÑÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
-msgstr "ÐÐÐÐÐÐ Ñ ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐ Ñ ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 "ÐÑÐÑ ÐÐÑÑÐ Ñ ÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ, ÐÐÐÑÐÐÑÐÐÐÐÐÐ "
-"ÐÐÐÐÑÐÐÐ 100."
+"ÐÐÐÐÑÐÐÐ ÑÐ 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
-"ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÑÑ --help ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÑÐ "
+"ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐ, ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÑÑ â--helpâ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÑÐ "
 "ÐÐÑÐÑÑÐ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
-msgstr "ÐÐÐÑÐÐÐÐ ÑÐÐÐ csv ÐÐÐ vcard ÐÐÐÐÐ."
+msgstr "ÐÐÐÑÐÐÐÐ ÑÐÐÐ ÑÑÐ ÐÐÐ ÐÐÐÑÐ ÐÐÐÐÐ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "Ð ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ, ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑ, ÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
 #: ../addressbook/util/addressbook.c:103
 msgid "Accessing LDAP Server anonymously"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÑÐ LDAP ÑÐÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
 
 #: ../addressbook/util/addressbook.c:215
 #: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ.\n"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ.\n"
 
 #: ../addressbook/util/addressbook.c:222
 #: ../plugins/groupwise-features/camel-gw-listener.c:506
@@ -1550,7 +1543,7 @@ msgid "Enter password for %s (user %s)"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
 
 #: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:55
+#: ../calendar/common/authentication.c:53
 #: ../plugins/caldav/caldav-browse-server.c:813
 #: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
@@ -1573,80 +1566,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}'?"
@@ -1654,7 +1647,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
@@ -1684,7 +1677,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐ
 #: ../calendar/gui/dialogs/delete-comp.c:197
 #, 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:194
@@ -1693,40 +1686,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"
@@ -1734,11 +1723,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."
@@ -1752,7 +1741,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."
@@ -1802,7 +1791,7 @@ msgid ""
 "calendars up to date."
 msgstr ""
 "ÐÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÑÑÐÐÐÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐ ÐÐÐÐÐÐÐÑ ÐÑÐÐ "
-"Ñ ÑÐÐÑ."
+"ÐÑÐÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid ""
@@ -1810,15 +1799,15 @@ msgid ""
 "lists up to date."
 msgstr ""
 "ÐÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÑÑÐÐÐÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐ ÑÐÐÑÐÐ "
-"ÐÐÐÐÑÐÐÐ ÐÑÐÐ Ñ ÑÐÐÑ."
+"ÐÐÐÐÑÐÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
-"ÐÑÐÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ. ÐÐÐÐÐÐÐ ÑÐÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÐÐÐÐ "
-"ÐÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÑÐ ÑÐÐ."
+"ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÐÐÐ ÑÐÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ "
+"ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÑÐ ÑÐÐ."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid ""
@@ -1874,7 +1863,7 @@ msgstr "ÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐ
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑÑ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑÑ?"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
@@ -1882,11 +1871,11 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐ
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÑÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÑÐ?"
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
@@ -1899,19 +1888,19 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÐÐÐ ÑÑÐÑÐÐÑÐÐÐ Ð
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:72
 msgid ""
@@ -1919,49 +1908,49 @@ msgid ""
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
-"ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ GroupWise ÑÐÑÐÐÑ ÑÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ "
+"ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ ÑÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ "
 "ÑÐÐÑ ÐÐÐÐÑÑÐÑÐ. ÐÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÑÐÐÑ ÐÑÐÐ ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÐÐÐÐÐÑÐ, ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ, ÐÐÐ ÐÐÐÐÐÐ ÑÐÑ ÐÐÑÑ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ, ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÑÐ ÐÐÑ ÐÐÐÐÑÐÑ, ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÑ ÐÐÐÐÑÐÑ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
-msgstr "_ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "_ÐÐÑÑÐÐÑ"
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
-msgstr "ÐÐÑÑÐÐÑ ÐÑÐ_ÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑ ÐÐ_ÐÐÐÐ"
 
 #: ../calendar/calendar.error.xml.h:83
 #: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
@@ -1974,7 +1963,7 @@ msgid "_Send Notice"
 msgstr "ÐÐÑÐÑÐ ÐÐ_ÐÑÐÑÐÐÐ"
 
 # bug: plural-forms
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ÐÐÐÑÑ"
@@ -1982,7 +1971,7 @@ msgstr[1] "ÐÐÐÑÑÐ"
 msgstr[2] "ÐÐÐÑÑÐ"
 msgstr[3] "ÐÐÐÑÑ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ÑÐÑ"
@@ -1990,7 +1979,7 @@ msgstr[1] "ÑÐÑÐ"
 msgstr[2] "ÑÐÑÐ"
 msgstr[3] "ÑÐÑ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "ÐÑÐÐÐ ÐÐÑÐÑÐÐ"
 
@@ -2005,8 +1994,8 @@ msgstr "ÐÐÐÐÐÐÑÐ _ÑÐÐ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
 #: ../calendar/gui/e-itip-control.c:1175
 #: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
@@ -2021,43 +2010,33 @@ msgid "_Dismiss"
 msgstr "_ÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "_ÐÑÐÑÐÐÐÑÐ"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "ÐÑÐ_ÐÐÑÐ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "ÑÐÑÐ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 
 # bug: plural-forms
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "ÐÐÐÑÑÐ"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÐÑÐÐ."
 
@@ -2076,25 +2055,25 @@ msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑÐ."
 msgid "You have %d alarms"
 msgstr "ÐÑÐÑ ÐÐÑÑÐÐÑÐÐÐÑ ÐÐÐÑÐÐ: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 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:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2104,14 +2083,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:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÑÐÐÑÐÐ."
 
@@ -2192,11 +2171,11 @@ msgstr "ÐÐÑÐ ÐÐ ÐÑÑÑÑÐÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
-msgstr "ÐÐÑÐÑÐÐ ÐÑÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐÑÐÐ ÐÑÐÐÑÐÑÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
@@ -2204,7 +2183,7 @@ msgstr "ÐÑÐÑ ÐÐÐÑÐÐÑÐÐÐÐÐÐÑ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÑ Ð ÐÐÐÑÑÐÐÐÑÑ ÑÐ ÑÐÐÐÐ ÑÐÑÐÐÐ."
+msgstr "ÐÐÐÐ Ñ ÐÐÑÐÐÐ ÑÑÐÐÐÑÑ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐ Ð ÐÐÐÑÑÐÐ ÑÐÐÐÐ ÑÐÑÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
@@ -2212,7 +2191,7 @@ msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐ ÐÑÐÑ ÐÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÑ ÐÐÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
@@ -2248,38 +2227,38 @@ msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
-msgstr "ÐÐÐÑÐÑ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
-msgstr "ÐÐÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
-msgstr "ÐÐÐÑÐÑ ÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
-"ÐÐÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐ, Ñ ÐÐÐÐÐÑÐÑÑÐÑÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ, ÐÐ 0 "
-"ÐÐ 23."
+"ÐÐÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐ, Ñ ÐÐÐÐÐÑÐÑÑÐÑÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ, ÐÐ 0 ÐÐ "
+"23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
-"ÐÐÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐÐÑÐ, Ñ ÐÐÐÐÐÑÐÑÑÐÑÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ, ÐÐ 0 ÐÐ 23."
+"ÐÐÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ, Ñ ÐÐÐÐÐÑÐÑÑÐÑÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ, ÐÐ 0 ÐÐ 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "ÐÐÐÐÐÐÐ ÑÐ âÑÐÑÐÐâ, Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ."
+msgstr "ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
-msgstr "ÐÐÐÐÐÐÐ ÑÐ âÑÐÑÐÐâ, Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2308,11 +2287,11 @@ msgstr "ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ - ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ â ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ - ÑÑÐÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ â ÑÑÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
@@ -2332,11 +2311,11 @@ msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ (ÐÐÑÑÐÐÐÐÐÐ)"
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ (ÐÐÐÐÐÐÐÐ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ (ÐÐÑÑÐÐÐÐÐÐ)"
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ (ÑÑÐÑÐÐÐÐ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
@@ -2348,11 +2327,11 @@ msgstr "ÐÐÐÑÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ, ÐÐ 0 ÐÐ 59."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
@@ -2371,35 +2350,35 @@ msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ "
-"ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ, Ñ ÐÐÐÑÐÐÐÐÐ."
+"ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ "
+"ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
-"ÐÐÐÐÑÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÐÐÐÑÐÐÐÐÐ."
+"ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
+"ÐÐÐÐÑÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÑÐÑÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÑÐÐÐÐÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÑÐÑÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr ""
-"ÐÐÐÐÐÐÑ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ "
+"ÐÐÐÐÐÐÑ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÐÐÐÐÑÐ Ð ÐÑÐÑÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ "
 "ÐÐÑÑÐÑ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
@@ -2407,16 +2386,16 @@ msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
-"ÐÐÐÐÑÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÐÐÐÑÐÐÐÐÐ."
+"ÐÐÐÐÐÐÑ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
+"ÐÐÐÐÑÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
-"ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ, Ñ ÐÐÐÑÐÐÐÐÐ."
+"ÐÐÐÐÐÐÑ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
+"ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
@@ -2448,11 +2427,13 @@ msgstr "ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "ÐÑÐÐÐÐÐ RSVP ÐÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr ""
+"ÐÑÐÐÐÐÑÑÐ ÐÐÐÐ ÐÐÑÐ (ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ) Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/"
+"ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ ÑÐÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
@@ -2460,7 +2441,7 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÑÐÑÑÐÐÐÐÐ/ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÑÐÑÑÐÐÐÐÐ/ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
@@ -2468,7 +2449,7 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÐ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ ÑÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
@@ -2480,17 +2461,17 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ ÑÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-#, fuzzy
-#| msgid "Show week number in Day and Work Week View"
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐ Ð ÐÑÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑ ÐÐÐÐÑÑ"
+msgstr ""
+"ÐÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ, ÐÑÐÐÐÐÐÑ ÑÐÐÐÐ ÐÐÐÐÑÐ Ð "
+"ÐÑÐÑÑÐÐÐÐÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
@@ -2498,7 +2479,8 @@ msgid ""
 "used in a 'timezone' key."
 msgstr ""
 "ÐÑÐÐÐÐÑÑÐ ÐÑÑÐÑ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ, ÑÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ. "
-"ÐÑÐÐÐÐÑÑ ÑÐ ÑÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐÐÐ Ñ ÐÑÑÑÑ âtimezoneâ."
+"ÐÑÐÐÐÐÑÑ ÑÐ ÑÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐÐÐ Ñ ÐÑÑÑÑ âtimezoneâ (ÐÑÐÐÐÐÑÐÐ "
+"ÐÐÐÐ)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
@@ -2506,15 +2488,15 @@ msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (ÑÐÑÐÐÐÐÑÐÐÐÐ)"
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (ÐÐÐÐÐÐÐÐ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (ÐÐÑÑÐÐÐÐÐÐ)"
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (ÑÑÐÑÐÐÐÐ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑ"
+msgstr "ÐÐÑÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
@@ -2522,7 +2504,7 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ Ñ ÐÐÐÑÐÑÐÑÑ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ, %u ÑÐ "
+"ÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ Ñ ÐÐÐÑÐÑÐÑÑ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ, %u ÑÐ "
 "ÐÐÐÐÑÑÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ, Ð %d ÐÐÐÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
@@ -2539,9 +2521,9 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
-"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ. "
-"â0â (ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ. "
-"â1â (ÐÐÑÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ."
+"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ. 0 â "
+"(ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ. 1 â (ÑÑÐÑÐÐÐÐ "
+"ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
@@ -2549,9 +2531,9 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ. "
-"â0â (ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ. "
-"â1â (ÐÐÑÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ."
+"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ. 0 â "
+"(ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ. 1 â (ÑÑÐÑÐÐÐÐ "
+"ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
@@ -2562,7 +2544,7 @@ msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"ÐÐÐÐ ÐÐÐÑÐ ÑÑÐ ÐÑÐÐÐÐÑÑÐ. 0 ÐÐ ÐÑÐÑÐÐ. 1 ÐÐ ÑÐÐÐÐÑÐÑÐ. 2 ÐÐ ÐÐÑÑÐÐ Ð "
+"ÐÐÐÐ ÐÐÐÑÐ ÑÑÐ ÐÑÐÐÐÐÑÑÐ: 0 â ÐÐ ÐÑÐÑÐÐ, 1 â ÐÐ ÑÐÐÐÐÑÐÑÐ Ð 2 â ÐÐ ÐÐÑÑÐÐ Ð "
 "ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
@@ -2571,7 +2553,7 @@ msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
-msgstr "ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÑÐÐ, Ñ time_t."
+msgstr "ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÑÐÐ, Ñ time_t (ÐÑÐÐÐ_Ñ)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
@@ -2582,8 +2564,8 @@ msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
-"ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ, ÐÑÐÐÐÐÑÑ ÐÐÐÐÑÑ 0 (ÐÑÐÐÐÐÐÐ) Ð 1 "
-"(ÐÐÐÑÐÐÐÐÐÐ)"
+"ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ, ÐÑÐÐÐÐÑÑ ÐÐÐÐÑÑ 0 â (ÐÑÐÐÐÐÐÐ) Ð 1 "
+"â (ÐÐÐÑÐÐÐÐÐÐ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
@@ -2613,7 +2595,7 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
-msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÑÐÑÑÐÐÐ"
+msgstr "ÐÐÑÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
@@ -2634,37 +2616,39 @@ msgstr "ÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐ, ÐÐ ÐÐÐÐÑÐ (0) ÐÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐÑ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "ÐÐ ÐÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "ÐÐ ÐÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÑ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÑ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"ÐÐ ÐÐ ÐÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, ÐÐÑÐ ÑÑÐÐÑÑ Ð ÐÐÐÐÑÑ ÑÑÐÐÑÐ Ñ "
+"ÐÐ ÐÐ ÑÐ ÐÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, ÐÐÑÐ ÑÑÐÐÑÑ Ð ÐÐÐÐÑÑ ÑÑÐÐÑÐ Ñ "
 "ÐÑÐÑÑÐÑ ÑÐÐÐÐ ÐÐÐÐÑÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ."
+"ÐÐ ÐÐ ÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÐÐ "
+"ÐÑÐÐÐÐÐÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "ÐÐ ÐÐ ÐÐ Ñ ÐÐÐÐÐÐÐÑÑ ÐÑÑÑÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÑ (ÐÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐ)."
+msgstr ""
+"ÐÐ ÐÐ ÑÐ Ñ ÐÐÐÐÐÐÐÑÑ ÐÐ ÐÑÑÑÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÑ (ÐÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐ)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "ÐÐ ÐÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
@@ -2676,7 +2660,9 @@ msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ RSVP Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐ (ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ) Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/"
+"ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
@@ -2694,7 +2680,7 @@ msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÑÑÐ Ñ ÑÑÐÑÐÐÐ
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÐÑÐÑÐÑÐÑÐÐÐÐÐ ÑÐÑÐÐÑÑ, ÑÐÐÑÑÐ am/pm."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÐÑÐÑÐÑÐÑÐÐÐÐÐ ÑÐÑÐÐÑÑ, ÑÐÐÑÑÐ ÐÑÐÐ./ÐÐÐ.."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -2705,10 +2691,8 @@ msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-#, fuzzy
-#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÑ ÐÐ ÐÐÑÑÐ."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐ ÑÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
@@ -2716,7 +2700,7 @@ msgstr "ÐÐÐÐÐ ÐÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
-msgstr "ÐÐÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐ"
+msgstr "ÐÐÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
@@ -2724,7 +2708,7 @@ msgstr "ÐÐÐÑÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
-msgstr "ÐÐÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ"
+msgstr "ÐÐÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
@@ -2764,7 +2748,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
@@ -2776,7 +2760,7 @@ msgid "Classification"
 msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/e-cal-model.c:535 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2786,7 +2770,7 @@ msgstr "ÐÐÐÐÑÑÐÐÐ"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ÐÐÐÑ"
@@ -2820,13 +2804,13 @@ msgid "Organizer"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:533 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ÐÐÑÐÐ"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-cal-model.c:531
 #: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ÐÐÐÐÐ"
@@ -2901,17 +2885,17 @@ msgid "Add Alarm"
 msgstr "ÐÐÐÐÑ ÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
 msgstr "ÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
-msgstr "ÐÑÐÐÐÐÐÑÐÐÐ _ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ _ÐÐÑÑÐÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
-msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
@@ -2927,7 +2911,7 @@ 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:"
@@ -2957,20 +2941,16 @@ msgstr "ÐÐÑÐÐ"
 msgid "before"
 msgstr "ÐÑÐ"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "ÐÐÐ(Ð)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "ÐÐÐÐ"
 
@@ -3006,7 +2986,7 @@ msgstr "_ÐÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "ÐÐÐÑÐÐ"
 
@@ -3018,6 +2998,7 @@ msgstr "ÐÐÐÑÐÐ"
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
@@ -3034,19 +3015,17 @@ msgid "Selected Calendars for Alarms"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐ ÐÐÐÐÐ ÑÐÑ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-#| msgid "Time and date:"
 msgid "Ti_me and date:"
 msgstr "_ÐÑÐÐÐ Ð ÐÐÑÑÐ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#| msgid "Date only:"
 msgid "_Date only:"
 msgstr "ÐÐÐÐ _ÐÐÑÑÐ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u Ð %d ÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐÐ Ð ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ."
+msgstr "%u Ð %d ÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐÐ Ð ÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
@@ -3118,8 +3097,8 @@ msgstr "ÐÐÑÐÐ"
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2676
+#: ../modules/addressbook/addressbook-config.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:2680
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3140,206 +3119,192 @@ msgstr "ÐÐÐÑÑÐ"
 msgid "Monday"
 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 not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "ÐÐÑÑÐ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
 #: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "ÐÐÑÐ ÐÐÑÑ"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "Ð_ÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "ÐÑÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "ÐÑÐ_ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "ÐÑÑ_ÐÐ ÐÐÐÐ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÑÐ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
 msgstr "ÐÑÐ_ÐÐÐÐ ÐÐÐÑÐÑÐÐÐ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#| msgid "Show week _numbers in date navigator"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show week _numbers"
 msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "Ð_ÐÐÐÑÐ ÐÐ ÐÐÐÐÑ:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "Ð_ÑÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 #: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
-msgstr "ÐÐÐÐÐ:"
+msgstr "ÐÐÐÐÐÐ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ÐÐÑÐÑÑÐÐ"
 
 # note(slobo): ÐÐÐÐÐ ÑÑÐÐÐ ÑÐÐ
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
+#: ../widgets/misc/e-dateedit.c:595
 msgid "Time"
 msgstr "ÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
 msgstr "ÐÑÐÐÐÐÑÐÐ _ÐÐÐÐ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "ÐÑÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ _ÑÐÑÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ÐÑÐÐÐ"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "ÐÐÑÐÑÐÐ Ð_ÐÐÐÑÐ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 #: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "ÐÐÐÐÐ ÐÐÐÐ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
-msgstr "_12 - ÑÐÑÐÐÐÐ (AM/PM)"
+msgstr "_12-ÑÐÑÐÐÐÐ (ÐÑÐ/ÐÐÐ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
-msgstr "_24 - ÑÐÑÐÐÐÐ"
+msgstr "_24-ÑÐÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "_ÐÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "_ÐÐÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "ÐÐÑÐÑÐÐ _ÐÐÐÐ:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "_ÐÐÑ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "_ÐÐÐÑÐÑ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐ"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "_ÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "_ÐÐÐÑÐÑÑÐÐÐ ÐÐÐÐÑÐ:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "_ÐÑÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "_ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "ÐÐÐÐÐÐ _ÐÑÐÐÐÐÐ:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "_ÐÑÐ"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "_ÐÑÐ"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "ÐÑÐ ÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ/ÑÐÑÐÐÐÐÐÐ"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "ÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
@@ -3356,7 +3321,7 @@ msgstr "_ÐÐÐ:"
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_ÐÐÐ:"
 
@@ -3394,7 +3359,7 @@ msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
-msgstr "ÐÐ_ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
@@ -3402,7 +3367,7 @@ msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
-msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -3419,34 +3384,35 @@ 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:448
 #, c-format
@@ -3455,11 +3421,11 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÑÐ: %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
@@ -3468,27 +3434,27 @@ msgstr "ÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 #: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
-msgstr "ÐÐÑÑÐÐÐÐ - %s"
+msgstr "ÐÐÑÑÐÐÐÐ â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ - %s"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ - %s"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
-msgstr "ÐÐÐÐÑÐÐ - %s"
+msgstr "ÐÐÐÐÑÐÐ â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
-msgstr "ÐÐÐÐÑÐÐ - %s"
+msgstr "ÐÐÐÐÑÐÐ â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
@@ -3504,23 +3470,23 @@ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÑÐÐÑÑÐ ÐÑ
 
 #: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1055
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
-msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1004
 #: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
@@ -3528,10 +3494,10 @@ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÐÑ ÐÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1067
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
-msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
@@ -3539,17 +3505,26 @@ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑÑÐ ÐÑÐ
 
 #: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
-msgstr "ÐÐÐÐÐÑÐ ÑÐÐ ÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÑÐÐÑÑ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "ÐÐÐÐ_ÐÐ"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_ÐÑÐÑÐÐÐÑÐ"
+
 #: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "ÐÐÑÐ_ÑÐÐÐ"
 
@@ -3563,23 +3538,23 @@ msgid "_Insert"
 msgstr "_ÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_ÐÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:240
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_ÐÑÐÐÐÐ..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
@@ -3587,7 +3562,7 @@ msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
@@ -3595,7 +3570,7 @@ msgstr "ÐÑÐÐÐÐÑÐÐ _ÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
@@ -3603,7 +3578,7 @@ msgstr "_ÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
@@ -3611,7 +3586,7 @@ msgstr "Ð_ÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
@@ -3619,39 +3594,39 @@ msgstr "ÐÐÐÐ_ÑÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
-msgstr "_ÐÐÐÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ _ÑÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
-msgstr "_RSVP"
+msgstr "_ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ RSVP ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
-msgstr "_ÐÑÐÑÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ _ÑÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÑÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
-msgstr "_ÐÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ _ÑÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐ ÐÑÐÑÑÑÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
@@ -3659,7 +3634,7 @@ msgid "Recent _Documents"
 msgstr "ÐÐÐÑÐÑÑÐ _ÐÐÐÑÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "ÐÑÐÐÐÐÐ"
 
@@ -3677,15 +3652,15 @@ msgstr "ÐÑÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÑÐÐÑÐ!"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐ!"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÐÑÑÐ"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
@@ -3693,84 +3668,76 @@ msgstr "ÐÐÑÐÐÐÑÑÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_ÐÐÑÐÑÐ ÐÐÑ ÑÑÐÐÐÑ ÐÐ ÑÐÐÑ ÐÑÑÐÐÐÑ ÐÐÑÑÐÐÑÐÐÑ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ?"
+msgstr ""
+"ÐÐ ÐÐ ÐÐ _ÐÐÐÑÐÑÐÐ ÐÐÑ ÑÑÐÐÐÑ ÐÐ ÑÐÐÑ ÐÑÑÐÐÐÑ ÐÐÑÑÐÐÑÐÐÑ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ?"
 
 #: ../calendar/gui/dialogs/delete-comp.c:217
-#| msgid "P_ercent complete:"
 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..."
@@ -3790,7 +3757,7 @@ msgstr "ÐÐÐ_ÑÐÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Show Time as _Busy"
@@ -3798,7 +3765,7 @@ msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐ _ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:229
 msgid "Toggles whether to show time as busy"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
@@ -3810,15 +3777,15 @@ msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "ÐÐÑÐÑÐ ÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:247
 #: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
-msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
@@ -3836,21 +3803,19 @@ msgstr "Ð_ÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ:"
 msgid "Query free / busy information for the attendees"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐ ÑÑÐÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2674
 msgid "Appointment"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-editor.c:387
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "ÐÑÐÑÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
-#, fuzzy
-#| msgid "Print this message"
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
-msgstr "ÐÑÐÐÐÐÑ ÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑ ÐÐÑÑÐÑ"
 
 #: ../calendar/gui/dialogs/event-page.c:766
 msgid "Event's start time is in the past"
@@ -3871,7 +3836,7 @@ msgid "This event has alarms"
 msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐÐ ÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑ:"
@@ -3930,7 +3895,7 @@ msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐ ÐÐÑÑÐÐÐÐ."
 #: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ â%sâ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ â%sâ."
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -3987,84 +3952,82 @@ msgctxt "cal-alarms"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 day before appointment"
-msgstr "1 ÐÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgid "1 hour before appointment"
-msgstr "1 ÑÐÑ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "15 minutes before appointment"
-msgstr "15 ÐÐÐÑÑÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Atte_ndees..."
 msgstr "ÐÑ_ÐÑÐÐÑÐ..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Custom Alarm:"
-msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÑÐ:"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÑÐ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "_ÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "_ÐÐÐÑ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 #: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_ÐÐÐÐÑÐÑÐ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#| msgid "Summary:"
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_ÐÐÐÐÑÐÐ:"
 
 # note(slobo): ÐÐÐÐÐ ÑÑÐÐÐ ÑÐÐ
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_ÐÑÐÐÐ:"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 ÐÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 ÑÐÑ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+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
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "eventpage"
 msgid "for"
 msgstr "ÐÐ"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2678
 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:338
 msgid "Memo's start date is in the past"
@@ -4081,12 +4044,12 @@ msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐ
 #: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ â%sâ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:269
-#: ../em-format/em-format.c:1026 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2299
+#: ../mail/em-format-html.c:2358 ../mail/em-format-html.c:2382
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "ÐÑÐÐÐ"
 
@@ -4156,13 +4119,13 @@ msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:932
 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:961
 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
@@ -4170,7 +4133,7 @@ msgstr "ÐÐ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1018
 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]'
@@ -4179,7 +4142,7 @@ msgstr "ÐÑÐÐÑ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1024
 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
@@ -4187,7 +4150,7 @@ msgstr "ÐÑÑÐÐÑ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1029
 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
@@ -4195,7 +4158,7 @@ msgstr "ÑÑÐÑÐÑ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1034
 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
@@ -4203,7 +4166,7 @@ msgstr "ÑÐÑÐÑÑÐÑ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1039
 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
@@ -4211,7 +4174,7 @@ msgstr "ÐÐÑÐ"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1044
 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]).
@@ -4244,7 +4207,7 @@ msgid "21st to 31st"
 msgstr "ÐÐ ÐÐÐÐÐÑÐÑ ÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑÐÑ ÐÑÐÐÐ"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (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:1111
 msgid "day"
@@ -4267,15 +4230,15 @@ msgstr "ÐÐÐÐÑ ÐÐÑÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
-msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÐÑ ÑÐÐÐ ÐÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÐ ÐÐÑÐÑÐ."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
-msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
-msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÐÑ ÑÐÐÐ ÐÑÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÐ ÐÑÐÑÐÑÐ."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
@@ -4298,22 +4261,44 @@ msgid "This appointment rec_urs"
 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
+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
+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
+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
+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
+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
+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
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ÐÐÐÐÐÐ(Ð)"
 
@@ -4340,7 +4325,7 @@ msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ"
 #: ../calendar/gui/e-cal-model-tasks.c:443
 #: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../calendar/gui/print.c:2761 ../mail/em-sync-stream.c:151
 #: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
 #, c-format
 msgid "Canceled"
@@ -4355,7 +4340,7 @@ msgstr "ÐÑÐÐÐÐÐÐ"
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
 #: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/print.c:2758 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ÐÐÐÑÑÐÐÐ"
@@ -4364,9 +4349,9 @@ msgstr "ÐÐÐÑÑÐÐÐ"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../mail/message-list.c:1183 ../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
@@ -4375,7 +4360,7 @@ msgstr "ÐÐÑÐÐÐ"
 #: ../calendar/gui/e-cal-model-tasks.c:713
 #: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2669
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "Ð ÑÐÐÑ"
 
@@ -4383,18 +4368,18 @@ msgstr "Ð ÑÐÐÑ"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../mail/message-list.c:1181 ../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:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/e-cal-model.c:1279 ../calendar/gui/e-task-table.c:512
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../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
@@ -4402,9 +4387,9 @@ msgstr "ÐÐÐÑÐÐ"
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:2752 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
@@ -4418,7 +4403,7 @@ msgstr "_ÐÑÐÑÐ:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-calendar-view.c:1777
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4429,16 +4414,16 @@ msgstr "ÐÑÐÑÑÑ"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
 #: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.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:"
 msgstr "_ÐÐÑÑÐ ÐÐÐÑÑÐÑÐÐ:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_ÐÐÐÐÐÑÑ:"
 
@@ -4452,15 +4437,15 @@ msgstr "ÐÐÑ_ÐÑÐ ÑÑÐÑÑÑÐ"
 
 #: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÑ ÐÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÑÑÐÑÑÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐ ÑÑÐÑÑÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
-msgstr "ÐÐÐ_ÑÑÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐ"
+msgstr "ÐÐÐ_ÑÑÐÐÑÑÐ ÑÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
-#: ../widgets/misc/e-send-options.c:502
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2676
+#: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "ÐÐÐÐÑÐÐ"
 
@@ -4469,10 +4454,8 @@ msgid "Task Details"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-editor.c:373
-#, fuzzy
-#| msgid "Print the list of tasks"
 msgid "Print this task"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-page.c:343
 msgid "Task's start date is in the past"
@@ -4488,7 +4471,7 @@ msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÐÐÑÐ, ÐÐÑÑÐ ÑÐ
 
 #: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐÑÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐÑÐ ÑÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
@@ -4497,12 +4480,12 @@ msgstr "ÐÑÐÐÐÐ_ÐÐÑÐÑ:"
 
 #: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
-msgstr "ÐÐÑÑÐ ÐÐ ÐÐÐÑÑÐÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
+msgstr "ÐÑÐÑÑÐ ÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ â%sâ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ."
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -4545,49 +4528,49 @@ msgstr "ÐÐÐÑÑÐÑÐ ÑÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐ"
 #: ../calendar/gui/e-alarm-list.c:476
 #, 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:481
 #, 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:488
 #, 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:499
 #, 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:504
 #, 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:511
 #, 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:535
 #, 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
@@ -4596,7 +4579,7 @@ msgstr "%s ÐÐ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ÐÐ ÐÐÐÐÐÐÐÑ ÑÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ"
 
@@ -4616,7 +4599,7 @@ msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÐ:"
 
 #: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
-msgstr "ÐÐÑÑÐ ÐÐ ÐÐÐÑÑÐÑÐÐ:"
+msgstr "ÐÑÐÑÑÐ ÑÐÐ:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
@@ -4654,7 +4637,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
@@ -4692,54 +4675,54 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "ÐÐ"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-cal-model.c:537 ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:967 ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1281
 msgid "Recurring"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1283
 msgid "Assigned"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2236
 #, 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"
@@ -4751,7 +4734,7 @@ 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
@@ -4767,94 +4750,94 @@ msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÐ"
 #: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:572
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "ÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-calendar-view.c:448 ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
-msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:642 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
-msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÑÐÑÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1724
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Accepted"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1725
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2337
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "Declined"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1726
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "ÐÐ ÑÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1727
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2340
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Delegated"
 msgstr "ÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "Needs action"
 msgstr "ÐÐÑÑÐÐÐ ÑÐÐÑÑ"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1876 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1892 ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "ÐÐÑÑÐ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:1923
 #, c-format
 msgid "Time: %s %s"
 msgstr "ÐÑÐÐÐ: %s %s"
@@ -4910,8 +4893,8 @@ msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÑ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1892
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4926,7 +4909,7 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1909
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
@@ -4942,7 +4925,7 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1925
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../modules/calendar/e-cal-shell-view-private.c:1050
@@ -4950,25 +4933,24 @@ msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089 ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 msgid "am"
-msgstr "am"
+msgstr "ÐÑÐ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092 ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 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:2645
+#: ../calendar/gui/e-day-view.c:2676
 #, c-format
 msgid "Week %d"
-msgstr "%d. ÐÐÐÐÑÐ"
+msgstr "%d ÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:761
-#| msgid "Recurring"
 msgid "Recurring:"
 msgstr "ÐÐÐÐÐÐÐ:"
 
@@ -4980,7 +4962,7 @@ msgstr "ÐÐ. (ÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ)"
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] "ÐÐÐÐÐ %d ÐÐÐ"
+msgstr[0] "ÐÐÐÐÐÐ %d ÐÐÐÐ"
 msgstr[1] "ÐÐÐÐÐ %d ÐÐÐÐ"
 msgstr[2] "ÐÐÐÐÐÑ %d ÐÐÐÐ"
 msgstr[3] "ÐÐÐÐÐ ÐÐÐ"
@@ -5069,12 +5051,12 @@ msgstr "ÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ"
 
 #. Title
 #: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÑÐÑÐÐ"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
 #: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
@@ -5087,15 +5069,10 @@ msgid "An unknown person"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1145
-#, fuzzy
-#| msgid ""
-#| "<br> Please review the following information, and then select an action "
-#| "from the menu below."
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
-msgstr ""
-"<br> ÐÑÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐ."
+msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ."
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -5104,13 +5081,13 @@ msgstr ""
 # is not permitted.
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2318
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "Tentatively Accepted"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ Ñ ÑÐÐÐÑÐÐÐ"
 
@@ -5118,35 +5095,31 @@ msgstr "ÐÑÐÑÐÐÑÐÐÐ Ñ ÑÐÐÐÑÐÐÐ"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ, ÐÐÑÑÑÐÐ ÐÐÑÐ ÐÐ ÐÐÐÑÑÐ ÐÐÑÐ Ñ ÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ, ÑÑÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐ Ñ ÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÐÐÐÐ, ÐÐÑÑÑÐÐ ÐÐÑÐ ÐÐ ÐÐÐÑÑÐ ÐÐÑÐ Ñ ÐÐÑÐÐ ÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÐÐÐÐ, ÑÑÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐ Ñ ÐÐÑÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1369
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published meeting information."
+#, c-format
 msgid "%s has published meeting information."
-msgstr "<b>%s</b> ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ."
+msgstr "%s ÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ"
 
 #: ../calendar/gui/e-itip-control.c:1376
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+#, c-format
 msgid "%s requests the presence of %s at a meeting."
-msgstr "<b>%s</b> ÐÐÑÑÐÐÐ ÐÑÐÑÑÑÑÐÐ %s ÐÐ ÑÐÑÑÐÐÐÑ."
+msgstr "%s ÐÐÑÑÐÐÐ ÐÑÐÑÑÑÑÐÐ %s ÐÐ ÑÐÑÑÐÐÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1378
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests your presence at a meeting."
+#, c-format
 msgid "%s requests your presence at a meeting."
-msgstr "<b>%s</b> ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑ."
+msgstr "%s ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
@@ -5154,40 +5127,36 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1385
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+#, c-format
 msgid "%s wishes to be added to an existing meeting."
-msgstr "<b>%s</b> ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑ ÐÐÑÑÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1390
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+#, c-format
 msgid "%s wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÑÐÑÑÐÐÐÑ."
+msgstr "%s ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÑÐÑÑÐÐÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "ÐÐÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1398
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has replied to a meeting request."
+#, c-format
 msgid "%s has replied to a meeting request."
-msgstr "<b>%s</b> ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "ÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1406
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled a meeting."
+#, c-format
 msgid "%s has canceled a meeting."
-msgstr "<b>%s</b> ÐÑÐÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
@@ -5195,36 +5164,32 @@ msgstr "ÐÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
 #: ../calendar/gui/e-itip-control.c:1534
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has sent an unintelligible message."
+#, c-format
 msgid "%s has sent an unintelligible message."
-msgstr "<b>%s</b> ÑÐÑÐ ÐÐÑÐÐÑÐÑÐÐÑ ÐÐÑÑÐÑ."
+msgstr "%s ÑÐ ÐÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÐÑ ÐÐÑÑÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "ÐÐÑÐ ÐÐÑÑÐÐ Ð ÑÐÑÑÐÐÐÑ"
 
 #: ../calendar/gui/e-itip-control.c:1445
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published task information."
+#, c-format
 msgid "%s has published task information."
-msgstr "<b>%s</b> ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ."
+msgstr "%s ÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/e-itip-control.c:1453
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests %s to perform a task."
+#, c-format
 msgid "%s requests %s to perform a task."
-msgstr "<b>%s</b> ÑÑÐÐÐ %s ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐ."
+msgstr "%s ÑÑÐÐÐ %s ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1455
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests you perform a task."
+#, c-format
 msgid "%s requests you perform a task."
-msgstr "<b>%s</b> ÑÑÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐ."
+msgstr "%s ÑÑÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
@@ -5232,40 +5197,36 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐ"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1462
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing task."
+#, c-format
 msgid "%s wishes to be added to an existing task."
-msgstr "<b>%s</b ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ."
+msgstr "%s ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑ ÐÐÑÑÐÑÐÑÐÐ ÐÐÐÐÑÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1467
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to receive the latest task information."
+#, c-format
 msgid "%s wishes to receive the latest task information."
-msgstr "<b>%s</b> ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÑ."
+msgstr "%s ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÑ."
 
 #: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "ÐÐÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1475
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has replied to a task assignment."
+#, c-format
 msgid "%s has replied to a task assignment."
-msgstr "<b>%s</b> ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ."
+msgstr "%s ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:1483
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled a task."
+#, c-format
 msgid "%s has canceled a task."
-msgstr "<b>%s</b> ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐ."
+msgstr "%s ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
@@ -5276,38 +5237,35 @@ msgid "Bad Task Message"
 msgstr "ÐÐÑÐ ÐÐÑÑÐÐ Ð ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/e-itip-control.c:1519
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published free/busy information."
+#, c-format
 msgid "%s has published free/busy information."
-msgstr "<b>%s</b> ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ."
+msgstr "%s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1524
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests your free/busy information."
+#, c-format
 msgid "%s requests your free/busy information."
-msgstr "<b>%s</b> ÐÐÑÐ ÐÐÐÐ ÑÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ."
+msgstr "%s ÐÐÑÐ ÐÐÐÐ ÑÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ."
 
 #: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1529
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has replied to a free/busy request."
+#, c-format
 msgid "%s has replied to a free/busy request."
-msgstr "<b>%s</b> ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ."
+msgstr "%s ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ."
 
 #: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
-msgstr "ÐÐÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐ ÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
@@ -5319,15 +5277,15 @@ msgstr "ÐÐÑÑÐÐ ÑÐÐÑÐÐ ÑÐÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐ."
 
 #: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
-msgstr "ÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÑÐ ÐÐÐÑ ÐÑÐÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÑÐ ÐÐÐÑ ÐÑÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
-msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ\n"
+msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐ ÐÐÐÑÑÐÐÐ\n"
 
 #: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
@@ -5335,7 +5293,7 @@ msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ Ð ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐ
 
 #: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "ÐÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐÐ ÐÑÐÑÑÑÐÐ ÑÑÐÑÐÐÐ.  ÐÐÐÐÑÐ ÐÐ Ñ ÐÑÐÑÑÑÐÐ?"
+msgstr "ÐÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐÐ ÐÑÐÑÑÑÐÐ ÑÑÐÑÐÐÐ.  ÐÐ ÐÐ ÐÐÐÐÐ Ñ ÐÑÐÑÑÑÐÐ?"
 
 #: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -5343,16 +5301,16 @@ msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÑÐÐ ÑÐÑ ÐÐÐÐ
 
 #: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
-msgstr "ÐÐÑÑÐÑÐÐ ÑÑÐÑÑÑ ÑÑÐÑÐÐÐÐ\n"
+msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÑÐ ÐÐÑÑÐÑÐÐ\n"
 
 #: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1423
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑ ÑÑÐÐÐÐ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÑÐ!\n"
+msgstr "ÐÑÐÐÐÐ ÑÐ ÐÐÑÐÐÑÐ!\n"
 
 #: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
@@ -5367,7 +5325,7 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ:"
 #: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
-msgstr "RSVP"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
@@ -5389,7 +5347,7 @@ msgstr "ÐÐÐÐÑ"
 
 #: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
-msgstr "ÐÐÑÐÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
@@ -5400,8 +5358,8 @@ msgid "Send Latest Information"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:976
-#: ../widgets/misc/e-activity-proxy.c:298
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:300
 msgid "Cancel"
 msgstr "ÐÑÐÐÐÐ"
 
@@ -5423,7 +5381,7 @@ msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
-msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ..."
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ..."
 
 #: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
@@ -5451,49 +5409,49 @@ msgstr "ÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "ÐÐÑÐÐÐÐÐÑ"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1010 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ÐÑÑÐÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "ÐÐÐÐÑ"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "ÐÐÐÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "ÐÑÐÐÐÑÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐÑÐÐÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "ÐÐÐÑÑÐ ÑÑÐÑÐÐÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "ÐÐ-ÑÑÐÑÐÐÐ"
 
@@ -5629,7 +5587,7 @@ msgstr "ÐÐÐÐÐ"
 msgid "Member"
 msgstr "ÐÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:414
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5638,44 +5596,44 @@ msgstr "ÐÐÐÐ"
 msgid "Memos"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* ÐÐÐ ÑÐÐÐÑÐÐ *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "ÐÐÑÐÑÐÐ:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
-msgstr "ÐÐ: "
+msgstr "ÐÐÐ: "
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:716
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:722
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:728
+#: ../calendar/gui/e-memo-table.c:730
 #: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:736
 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
@@ -5686,18 +5644,17 @@ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
 #: ../calendar/gui/e-task-table.c:539
-#, fuzzy, c-format
-#| msgid "%d %b"
+#, c-format
 msgid "%d%%"
-msgstr "%d. %b"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:440
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5705,37 +5662,37 @@ msgstr "%d. %b"
 msgid "Tasks"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/e-task-table.c:933
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-task-table.c:951
+#: ../calendar/gui/e-task-table.c:953
 #: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:959
 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.
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5766,7 +5723,7 @@ msgstr "ÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
-msgstr "ÐÑÐÐÑÐ ÑÐÐÑÑ"
+msgstr "ÐÐÐÑÑÐÑÐÑ"
 
 #: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
@@ -5889,7 +5846,7 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑ"
 msgid "calendar view for one or more weeks"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÑ ÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/gnome-cal.c:2287
+#: ../calendar/gui/gnome-cal.c:2310
 msgid "Purging"
 msgstr "ÐÑÐÑÐÑÐ"
 
@@ -5961,11 +5918,11 @@ msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐ"
 
 #: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑÑ"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÑÑ"
 
 #: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
@@ -5973,11 +5930,11 @@ msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÑÑÐ"
 
 #: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÐÐÑÑ"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÑÑ"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
@@ -6053,250 +6010,250 @@ msgstr "ÐÑÐÑÐÐ-ÐÑÐÐÐÐÐ"
 #: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ (%s ÐÐ %s)"
+msgstr "ÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ (%s ÐÐ %s)"
 
 #: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑ, ÐÐÐÐ ÐÐÐÐÑÐÑ ÑÐ ÐÐÑÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÐÑ, ÐÐÐÐ ÐÐÐÐÑÐÑ ÑÐ ÑÑÐÐÐÑÐÐÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÐÐ."
 
 #: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑ, ÐÑÐÑÐÐ:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÐÑ, ÐÑÐÑÐÐ:"
 
 #: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐ."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "ÐÑ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "ÐÑ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "ÐÑ"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:2513
 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:2437
+#: ../calendar/gui/print.c:2521
 msgid " (Completed "
-msgstr " (ÐÐÐÑÑÐÐÐ "
+msgstr " (ÐÐÐÑÑÐÐÐ ÑÐ "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2441
+#: ../calendar/gui/print.c:2525
 msgid "Completed "
-msgstr "ÐÐÐÑÑÐÐÐ "
+msgstr "ÐÐÐÑÑÐÐÐ ÑÐ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2533
 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:2454
+#: ../calendar/gui/print.c:2538
 msgid "Due "
-msgstr "ÐÐ "
+msgstr "ÐÐÐ "
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "ÐÐÐÐÑÐÐ: %s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "ÐÑÐÑÑÑÐÐ:"
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "ÐÑÐÑÑÑ: %s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "ÐÐÐÐÐÑÑ: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ÐÐÑÑÐÑÐÐ ÐÐÐÑÑÐÐÐÐ: %i"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "ÐÐÑÐÑÐ: %s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ: %s"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:2836
 msgid "Contacts: "
 msgstr "ÐÐÐÑÐÐÑÐ: "
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
-msgstr "% ÐÐÐÑÑÐÐÐ"
+msgstr "% ÑÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
@@ -6316,119 +6273,102 @@ msgstr "ÐÐÐÐÐÐÐÐÑÐ Ð ÑÐÑÑÐÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1837
 msgid "Opening calendar"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ (.ics)"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ (.ics)"
 
 #: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "ÐÐÐÑÐÑÐÐÐ!"
 
 #: ../calendar/importers/icalendar-importer.c:662
-#, fuzzy
-#| msgid "vCalendar files (.vcf)"
 msgid "vCalendar files (.vcs)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ (.vcf)"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ (.vcs)"
 
 #: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
-msgstr "ÐÐÐÐÐÐÐÑÑÐÐ ÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1243
-#| msgctxt "New"
-#| msgid "M_eeting"
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1243
-#| msgid "Events"
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ÐÐÐÐÑÐÑ"
 
 #: ../calendar/importers/icalendar-importer.c:929
 #: ../calendar/importers/icalendar-importer.c:1244
-#| msgid "Task"
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../calendar/importers/icalendar-importer.c:932
 #: ../calendar/importers/icalendar-importer.c:1245
-#| msgid "Memo"
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../calendar/importers/icalendar-importer.c:941
-#| msgid "It has recurrences."
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ÐÐÐ ÐÐÐÐÐÑÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:946
-#, fuzzy
-#| msgid "This and Prior Instances"
 msgctxt "iCalImp"
 msgid "is an instance"
-msgstr "ÐÐÐÑ Ð ÐÑÐÑÑÐÐÐÐ ÑÐÐÑÐ"
+msgstr "ÑÐ ÐÑÐÐÐÑÐÐ"
 
 #: ../calendar/importers/icalendar-importer.c:951
-#| msgid "It has alarms."
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "ÐÐÐ ÐÐÐÑÐÐ"
 
 #: ../calendar/importers/icalendar-importer.c:956
-#, fuzzy
-#| msgid "%s attachment"
 msgctxt "iCalImp"
 msgid "has attachments"
-msgstr "%s ÐÑÐÐÐÐ"
+msgstr "ÐÐÐ ÐÑÐÐÐÐÐ"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:969
-#| msgid "Public"
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ÐÐÐÐÐ"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:972
-#| msgid "Private"
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "ÐÐÑÐÐ"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:975
-#| msgid "Confidential"
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
 #. Translators: Appointment's classification section name
 #: ../calendar/importers/icalendar-importer.c:979
-#| msgid "Classification"
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ"
@@ -6437,14 +6377,12 @@ msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ"
 #. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:984
 #: ../calendar/importers/icalendar-importer.c:1284
-#| msgid "Summary"
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Translators: Appointment's location
 #: ../calendar/importers/icalendar-importer.c:990
-#| msgid "Location"
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ÐÐÑÑÐ"
@@ -6453,29 +6391,24 @@ msgstr "ÐÐÑÑÐ"
 #. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:998
 #: ../calendar/importers/icalendar-importer.c:1280
-#| msgid "Start"
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ÐÐÑÐÑÐÐ"
 
 #. Translators: 'Due' like the time due a task should be finished
 #: ../calendar/importers/icalendar-importer.c:1009
-#, fuzzy
-#| msgid "Due"
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ÐÐÐ"
 
 #. Translators: Appointment's end time
 #: ../calendar/importers/icalendar-importer.c:1021
-#| msgid "End"
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ÐÑÐÑ"
 
 #. Translators: Appointment's categories
 #: ../calendar/importers/icalendar-importer.c:1031
-#| msgid "Categories"
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
@@ -6483,14 +6416,12 @@ msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
 #: ../calendar/importers/icalendar-importer.c:1055
-#| msgid "Completed"
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
 #. Translators: Appointment's URL
 #: ../calendar/importers/icalendar-importer.c:1063
-#| msgid "URL"
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "ÐÐÑÐÑÐ"
@@ -6498,7 +6429,6 @@ msgstr "ÐÐÑÐÑÐ"
 #. Translators: Appointment's organizer
 #: ../calendar/importers/icalendar-importer.c:1074
 #: ../calendar/importers/icalendar-importer.c:1077
-#| msgid "Organizer"
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
@@ -6506,20 +6436,17 @@ msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 #. Translators: Appointment's attendees
 #: ../calendar/importers/icalendar-importer.c:1097
 #: ../calendar/importers/icalendar-importer.c:1100
-#| msgid "Attendees"
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ÐÑÐÑÐÐÑÐ"
 
 #: ../calendar/importers/icalendar-importer.c:1114
-#| msgid "Description"
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ÐÐÐÑ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
 #: ../calendar/importers/icalendar-importer.c:1276
-#| msgid "Type"
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "ÐÐÐ"
@@ -6676,7 +6603,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/zones.h:57
 msgid "Africa/Lome"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐ"
 
 #: ../calendar/zones.h:58
 msgid "Africa/Luanda"
@@ -6708,7 +6635,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÐ"
 
 #: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÑ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
@@ -6716,7 +6643,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÐÐÑÐÐÐÑÐ"
 
 #: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÑÐÐÐ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÑÑÐÐÐ"
 
 #: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
@@ -6732,7 +6659,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÑÐÐÑÐÑ"
 
 #: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÑÐÑ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
@@ -6756,7 +6683,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÑÐÐÑ"
 
 #: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÐ"
 
 #: ../calendar/zones.h:78
 msgid "America/Adak"
@@ -6784,7 +6711,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÑÑÐÐ"
 
 #: ../calendar/zones.h:84
 msgid "America/Asuncion"
-msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÑÑÐÐ"
 
 #: ../calendar/zones.h:85
 msgid "America/Barbados"
@@ -6808,7 +6735,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÑÐ"
 
 #: ../calendar/zones.h:90
 msgid "America/Boise"
-msgstr "ÐÐÐÑÐÐÐ/ÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐ"
 
 #: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
@@ -6844,7 +6771,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÐÐ"
 
 #: ../calendar/zones.h:99
 msgid "America/Chihuahua"
-msgstr "ÐÐÐÑÐÐÐ/ÐÐÑÑÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÐÑÐÑÐ"
 
 #: ../calendar/zones.h:100
 msgid "America/Cordoba"
@@ -6856,7 +6783,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÐÑÑÐÑÐÐÐ"
 
 #: ../calendar/zones.h:102
 msgid "America/Cuiaba"
-msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÑÑÐÐÐ"
 
 #: ../calendar/zones.h:103
 msgid "America/Curacao"
@@ -6924,7 +6851,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÐÐÐ"
 
 #: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
-msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÐÐÑÐÐ"
 
 #: ../calendar/zones.h:120
 msgid "America/Guatemala"
@@ -7869,7 +7796,7 @@ msgstr "ÐÐÑÐÐÐ/ÐÐÐÑÐÐ"
 
 #: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
-msgstr "ÐÐÑÐÐÐ/ÐÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÑÐÐÑÐ"
 
 #: ../calendar/zones.h:356
 msgid "Europe/Zurich"
@@ -7917,7 +7844,7 @@ msgstr "ÐÐÐÐÑÑÐÐ/ÐÐÑÐÑ"
 
 #: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "ÐÐÐÐÑÑÐÐ/ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÐ/ÐÐÑÐÐÐÐ"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Apia"
@@ -8079,141 +8006,141 @@ msgstr "ÐÐÑÐÑÐÐ/ÐÐÐ"
 msgid "Save as..."
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐ..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:374
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Attach a file"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../composer/e-composer-actions.c:247
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "_ÐÐÑÐÐÑÐ"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../composer/e-composer-actions.c:254
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "ÐÑÐÐ_ÐÐÑ..."
 
-#: ../composer/e-composer-actions.c:261
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "ÐÑÐ_ÐÐÐÐ ÐÑÐÐ ÑÑÐÐÐÑ"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "ÐÐÑÑÐÐÑ _ÐÐÐ..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐ _ÐÐÑÑÑ"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
-msgstr "ÐÑÐÐ ÐÐÐ ÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐ ÐÐÑÑÑ"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "ÐÐÑ_ÐÑÐ"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
-msgstr "ÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "ÐÐÐÐ _ÐÐÑÑÐÐ"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
-msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "ÐÐ_ÐÐÐ ÑÑÑÐÐÐ"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
-msgstr "PGP _ÑÐÑÑÑÑ"
+msgstr "ÐÐÐ _ÑÐÑÑÑÑ"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
-msgstr "ÐÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ PGP-Ð"
+msgstr "ÐÐÑÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ ÐÐÐ-Ð"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
-msgstr "PGP _ÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐ _ÐÐÑÐÐÑÐ"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
-msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ PGP ÐÑÑÑÐ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ ÐÐÐ ÐÑÑÑÐ"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "Ð_ÐÐÐÐÑÑ ÐÐÑÑÐÐ"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÑÑ ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐÐ"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "Ð_ÑÐÐÐ ÐÐÐÑÐÑÐÐÑÑ"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
-msgstr "S/MIME _ÑÐÑÑÑÑ"
+msgstr "Ð/ÐÐÐÐ _ÑÐÑÑÑÑ"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "ÐÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ S/MIME ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ Ð/ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
-msgstr "S/MIME _ÐÐÑÐÐÑÐ"
+msgstr "Ð/ÐÐÐÐ _ÐÐÑÐÐÑÐ"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:367
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ S/MIME ÑÐÑÑÐÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ Ð/ÐÐÐÐ ÑÐÐÑÐÑÐÐ"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
-msgstr "_Bcc ÐÐÑÐ"
+msgstr "_ÐÑÑ ÐÐÑÐ"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ BCC ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÑÑ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
-msgstr "_Cc ÐÐÑÐ"
+msgstr "_ÐÑ ÐÐÑÐ"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ CC ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
-msgstr "ÐÐÐÐ_ÐÐÑ-ÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ_ÐÐÑ-ÐÐ"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑ-ÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÑ"
 
@@ -8223,15 +8150,15 @@ msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÐÐÐÑÑ (cc) ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (cc) ÐÐÑÑÐÐ"
 
 #: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ Ñ ÐÐÑÑÐ "
-"ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+"ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ Ñ "
+"ÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
@@ -8251,15 +8178,15 @@ msgstr "_ÐÑÐÐÐ:"
 
 #: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
-msgstr "_ÐÐÐÐÑÐ (Cc):"
+msgstr "_ÐÑ:"
 
 #: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
-msgstr "_ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ (Bcc):"
+msgstr "_ÐÑÑ:"
 
 #: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
-msgstr "Ð_ÐÐÑÐ ÐÐ:"
+msgstr "ÐÐÑÐÐÐ _ÐÐ:"
 
 #: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
@@ -8269,75 +8196,66 @@ msgstr "ÐÐ_ÑÐÐÐ:"
 msgid "Si_gnature:"
 msgstr "ÐÐÑÐ_ÐÑ:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑ."
 
-#: ../composer/e-composer-post-header.c:126
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "ÐÑÐÑÑÐÐÑÑÐ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "ÐÑÐÑÑÐÐÑÑÐ Ð ÐÐÐÐÑÑÑÐ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:313
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÑÑÑ"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:199
+#: ../composer/e-msg-composer.c:197
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_ÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑ."
 
-#: ../composer/e-msg-composer.c:1029
+#: ../composer/e-msg-composer.c:1030
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ "
+"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐ "
 "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../composer/e-msg-composer.c:1041
+#: ../composer/e-msg-composer.c:1042
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ "
-"ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ"
+"ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ "
+"ÐÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../composer/e-msg-composer.c:1465
-msgid "Unable to reconstruct message from autosave file"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÑÑÐÐÐÑÑÐÐÐ ÑÑÐÐÑÐ"
-
-#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
+#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1809
 msgid "Compose Message"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../composer/e-msg-composer.c:3538
-#, fuzzy
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
+#: ../composer/e-msg-composer.c:3475
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr ""
-"<b>(ÐÐÑÑÐÐÑÐÑ Ñ ÑÐÐÑ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÐÑÑ, ÑÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.)<b>"
+msgstr "ÐÐÑÑÐÐÑÐÑ Ñ ÑÐÐÑ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÐÑÑ, ÑÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ."
 
-#: ../composer/e-msg-composer.c:4144
+#: ../composer/e-msg-composer.c:4083
 msgid "Untitled Message"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
@@ -8357,11 +8275,11 @@ msgstr "ÐÐÐ ÐÐÐÐÐÐ ÑÑ ÑÐÐÐÑÐÐÐ."
 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:4
 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
@@ -8370,7 +8288,7 @@ msgstr "ÐÐÐÐ &quot;{0}&quot;, ÐÐÐÐÐ ÐÑÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÐ
 # system:no-load-file secondary
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
-msgstr "ÐÐÐÐ &quot;{1}&quot;."
+msgstr "ÐÐÐÐ â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -8378,42 +8296,42 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÑÐÑÐ ÑÑÐÑÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ, ÐÑÐÐ ÐÐÐ "
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÑÑÐÑÐÐ ÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ, ÐÑÐÐ ÐÐÐ "
 "ÐÐÐÑÑÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÐ ÐÐÑÑÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ "
 "ÐÐÑÑÐÑ ÐÐÑÐÐÑÐ."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑ."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑÐ &quot;{0}&quot;."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐ {0}."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ Ñ ÑÐÐÐÑÑÐÐÑÑÑÑ ÐÐÑÐÑÐÐÑ &quot;{0}&quot;."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ Ñ ÑÐÐÐÑÑÐÐÑÑÑÑ ÐÐÑÐÑÐÐÑ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Do you want to recover unfinished messages?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÑÑÐÐÐ ÐÐÑÑÐÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÑÑÐÐÐ ÐÐÑÑÐÐ?"
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "ÐÑÐÑÐÐÐÐÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ?"
+msgstr "ÐÑÐÑÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ?"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "ÐÑÐÑÐÐ Ñ ÑÑÐÐÑÑ ÑÐÐÐÑÑÐÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ &quot;{1}&quot;."
+msgstr "ÐÑÐÑÐÐ Ñ ÑÑÐÐÑÑ ÑÐÐÐÑÑÐÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid ""
@@ -8424,11 +8342,8 @@ msgstr ""
 "ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÑÑÐ ÑÑÐÐÐ."
 
 #: ../composer/mail-composer.error.xml.h:16
-#, 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:17
 msgid ""
@@ -8437,19 +8352,18 @@ msgid ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ HTML ÑÑÐÑÐÐÐÑÐ.\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐÐÐ ÑÑÐÑÐÐÐÑÐ.\n"
 "\n"
-"ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÐÐÐÑÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÐÐÑÐÐÑÐ gtkhtml Ð libgtkhtml ÐÐ ÑÐÑÑÐÐÑ."
+"ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÐÐÐÑÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÐÐÑÐÐÑÐ âgtkhtmlâ Ð âlibgtkhtmlâ ÐÐ "
+"ÑÐÑÑÐÐÑ."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐÑÐÑÐ ÐÐÑÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:21
-#, fuzzy
-#| msgid "You cannot attach the file `{0}' to this message."
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ â{0}â ÐÐÐÑ ÐÐÑÑÑÐ."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ â{0}â ÐÐÐÑ ÐÐÑÑÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8471,30 +8385,30 @@ msgstr "ÐÐÐ_ÑÐ"
 msgid "_Save Draft"
 msgstr "_ÐÐÑÑÐÐÑ ÐÐÑÑÑ"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
-msgstr "ÐÐÐÑÐÐÐ Anjal Ñ ÐÑÐÐÐÑÑ"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÑÐÐ Ñ ÐÑÐÐÐÑÑ"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
-msgstr "ÐÐÐÐÑÐÐÐ Anjal ÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÑÐ"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
-msgstr "ÐÐ ÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐ"
+msgstr "ÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
-msgstr "ÑÐÐÐÑ"
+msgstr "ÐÑÐÐÑÑÑÐÐ"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
-msgstr "ÐÐÐÑÐÐÑ ÐÐÑÑÐ Anjal"
+msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
 #: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ ÐÐÐ."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ ÐÐÐ."
 
 #: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
@@ -8505,26 +8419,24 @@ msgid "The email address you have entered is invalid."
 msgstr "ÐÐÐÑÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
 
 #: ../capplet/settings/mail-account-view.c:77
-#| msgid "Please enter your email address."
 msgid "Please enter your password."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÑ."
 
 #: ../capplet/settings/mail-account-view.c:256
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
-msgstr "CalDAV"
+msgstr "ÐÐÐÐÐÐ"
 
 #: ../capplet/settings/mail-account-view.c:360
 #: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
-msgstr "Google"
+msgstr "ÐÑÐÐ"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
 #: ../capplet/settings/mail-account-view.c:464
-#| msgid "Personal"
 msgid "Personal details:"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÑÐ:"
 
@@ -8537,220 +8449,204 @@ msgid "Email address:"
 msgstr "ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:"
 
 #: ../capplet/settings/mail-account-view.c:490
-#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ÐÐÑÐÑÐ:</span>"
+msgid "Details:"
+msgstr "ÐÐÑÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:496
-#| msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ÐÑÐÐÐÑÐ:</span>"
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "ÐÐÐ ÑÐÑÐÐÑÐ: "
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "ÐÐÑÐÑÐÐÑÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:545
-#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ÐÐÐÑÐ:</span>"
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "ÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:591
 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:587
+#: ../capplet/settings/mail-account-view.c:593
 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:589
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
 msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:597
 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:592
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "ÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:599
 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:608
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2228
 #: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "ÐÐÐÐÑÐÑÐÑ"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
-msgstr "ÐÐÐÑÐÐ - ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
-msgstr "ÐÐÐÑÐÐ - ÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
-msgstr "ÐÐÐÐÐ - ÐÐÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐ â ÐÐÐÐÑÐÑÐÑ"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
-msgstr "ÐÐÐÑÐÐ - ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
-msgstr "ÐÐÐÐÐ - ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
-msgstr "ÐÐÐÑÐÐ - ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
-msgstr "ÐÐÐÑÐÐ - ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
-msgstr "ÐÐÐÐÐ - ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:3003 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
-msgstr "ÐÐÐÐÐ - ÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "ÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
-msgstr "ÐÐÐÐÐ - ÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:719
-#, fuzzy
-#| msgid "Add WebDAV contacts to Evolution."
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google contacts with Evolution"
-msgstr "ÐÐÐÐÑÐ WebDAV ÐÐÐÑÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:720
-#, fuzzy
-#| msgid "Add Google Calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:727
 msgid "Setup Google calendar with Evolution"
-msgstr "ÐÐÐÐÑÐ Google ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:732
 msgid "You may need to enable IMAP access."
-msgstr "ÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ IMAP ÐÑÐÑÑÑÐ."
+msgstr "ÐÐÐÐÐ ÑÐÑÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÑÑÐ."
 
-#: ../capplet/settings/mail-account-view.c:733
-#, fuzzy
-#| msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ÐÐÑÐÐ ÐÐÐÐÑÐ:</span>"
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:757
-#, fuzzy
-#| msgid "Add weather calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:767
 msgid "Setup Yahoo calendar with Evolution"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:771
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
 msgstr ""
-"Yahoo ÐÐÐÐÐÐÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÑÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐ_ÐÑÐÐÐÐÐ. ÐÐÐÑÑÐÐÐ ÑÐÐ ÐÐ "
+"ÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÑÑ ÐÐÐÐÐ ÐÐÐÐÐÐ âÐÐÐ_ÐÑÐÐÐÐÐâ. ÐÐÐÑÑÐÐÐ ÑÐÐ ÐÐ "
 "ÑÐÑÐÐÑÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐ. ÐÐÑÐÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ ÐÑÑÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÐ "
 "ÐÑÐÑÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:768
-#, fuzzy
-#| msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐ</span>"
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:780
-#, fuzzy
-#| msgid "Choose calendar file"
+#: ../capplet/settings/mail-account-view.c:792
 msgid "Yahoo Calendar name:"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:1023
-#| msgid "Pass_word:"
+#: ../capplet/settings/mail-account-view.c:1061
 msgid "Password:"
 msgstr "ÐÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-account-view.c:1129
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:1101
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
@@ -8760,34 +8656,33 @@ 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:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:348 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:230 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
 #: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
 #: ../mail/message-list.c:1666
-#: ../modules/addressbook/e-book-shell-backend.c:95
-#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:135
 #: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-cal-shell-migrate.c:147
 #: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:105
 #: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:114
 msgid "On This Computer"
 msgstr "ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÑÑ"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "ÐÐÐÐÐÐ"
+#, c-format
+msgid "Modify %s..."
+msgstr "ÐÐÐÐÐÐ %s..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
-msgstr "ÐÐÐÐÑ ÐÐÐÐ ÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../capplet/settings/mail-settings-view.c:184
-#| msgid "Account Management"
 msgid "Account management"
 msgstr "ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ"
 
@@ -8797,31 +8692,31 @@ 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"
 msgstr "ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:847
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 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: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"
@@ -8832,28 +8727,28 @@ msgid "Email Settings"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÐ"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (ÐÑÐÐÐÐÐÐ)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (ÐÐÐÑÑÐÐÐ)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s..."
 msgstr "%s..."
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr "%s (%d%% ÐÐÐÑÑÐÐÐ)"
+msgstr "%s (%d%% ÑÐ ÐÐÐÑÑÐÐÐ)"
 
 #: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
@@ -8864,46 +8759,46 @@ msgid "Evolution Warning"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 # bug(slobo): ÐÐÐÐÐ ÑÑ ÐÐÑÐ Ð ÐÐÑÐ ÐÑÐÐÐÐÐÐ, ÐÐÐÐÐÐ ÑÑ ÐÑÑÐ ÑÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÐÐ
-#: ../e-util/e-alert.c:649
+#: ../e-util/e-alert.c:659
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ, ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ â%sâ"
 
 #: ../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"
@@ -8911,7 +8806,7 @@ msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
-msgstr "ÐÑÑÑÐÐ"
+msgstr "ÐÑÑÑÐÐ"
 
 #: ../e-util/e-charset.c:64
 msgid "Unicode"
@@ -8919,54 +8814,53 @@ 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:196
 #: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
 msgstr "ÐÐÐÐÑ"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "ÐÑÑÑÐ"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "ÐÑÑÐ"
 
 #. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#: ../e-util/e-datetime-format.c:213
 #, c-format
-#| msgid "%d days from now"
 msgid "%d day from now"
 msgid_plural "%d days from now"
 msgstr[0] "ÐÐ %d ÐÐÐ"
@@ -8974,23 +8868,12 @@ msgstr[1] "ÐÐ %d ÐÐÐÐ"
 msgstr[2] "ÐÐ %d ÐÐÐÐ"
 msgstr[3] "ÐÐ %d ÐÐÐ"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, c-format
-#| msgid "%d days ago"
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "ÐÑÐ %d ÐÐÐ"
-msgstr[1] "ÐÑÐ %d ÐÐÐÐ"
-msgstr[2] "ÐÑÐ %d ÐÐÐÐ"
-msgstr[3] "ÐÑÐ %d ÐÐÐ"
-
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:290 ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:309
 msgid "Use locale default"
-msgstr "ÐÐÑÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑ"
+msgstr "ÐÐÑÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑ"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:503
 msgid "Format:"
 msgstr "ÐÐÑÐÐÑ:"
 
@@ -9002,14 +8885,14 @@ msgstr "(ÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÐ)"
 #: ../e-util/e-file-utils.c:140
 #, 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:145
 #, c-format
 msgid "Writing \"%s\" to %s"
-msgstr "ÐÐÐÑÐÐÐÑÐ â%sâ Ñ %s"
+msgstr "ÐÐÐÑÑÑÐÐ â%sâ Ñ %s"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
@@ -9074,18 +8957,18 @@ 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:731
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ ÑÐÑÑÐÐÑÐÐÐ"
 
@@ -9100,11 +8983,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?"
@@ -9120,127 +9003,128 @@ msgstr "_ÐÑÐÐÐÑÐ"
 
 #: ../e-util/e-util.c:146
 msgid "Could not open the link."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÑ."
 
 #: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
-msgstr "GConf ÐÑÐÑÐÐ: %s"
+msgstr "ÐÐÐÐÑ ÐÑÐÑÐÐ: %s"
 
 #: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "ÐÐÐ ÐÑÐÑÐÐ ÑÐ ÑÐÑÐÑÑÐ ÐÑÐÐÐÐÑÑÑ ÑÐÐÐ Ñ ÑÐÑÐÐÐÐÐÑ."
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1024
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "ÐÐÑÐ"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1025
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1027
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/em-format-html.c:2300 ../mail/em-format-html.c:2362
+#: ../mail/em-format-html.c:2385 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
-msgstr "ÐÐÐÐÑÐ (Cc)"
+msgstr "ÐÑ"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1028
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2366
+#: ../mail/em-format-html.c:2388 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
-msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ (Bcc)"
+msgstr "ÐÑÑ"
 
-#: ../em-format/em-format-quote.c:406 ../em-format/em-format.c:1029
+#: ../em-format/em-format-quote.c:414 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ÐÐÑÐÐÐ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:417 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/em-format-quote.c:425 ../mail/em-format-html.c:2482
+#: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "ÐÐÑÐÑÐÐÐÑ"
 
-#: ../em-format/em-format-quote.c:492 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:504 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ --------"
 
-#: ../em-format/em-format.c:1030 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "ÐÐÑÑÐ"
 
-#: ../em-format/em-format.c:1031 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
-msgstr "ÐÑÑÐÐ ÐÐ ÐÐÑÑÐ"
+msgstr "ÐÑÑÐÐ ÐÐÑÑÐ"
 
-#: ../em-format/em-format.c:1032 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ÐÐÑÐ"
 
-#: ../em-format/em-format.c:1411
+#: ../em-format/em-format.c:1433
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÐÑÐÐÐÐ"
 
-#: ../em-format/em-format.c:1472
+#: ../em-format/em-format.c:1522
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ S/MIME ÐÐÑÑÐÐ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ Ð/ÐÐÐÐ ÐÐÑÑÐÑ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../em-format/em-format.c:1627 ../em-format/em-format.c:1803
+#: ../em-format/em-format.c:1681 ../em-format/em-format.c:1866
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ MIME ÐÐÑÑÐÐ. ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÑ. ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ."
 
-#: ../em-format/em-format.c:1635
+#: ../em-format/em-format.c:1691
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÑÐÐ ÑÐÑÑÐ ÐÐ multipart/encrypted"
+msgstr "ÐÐÐÐÐÑÐÐÐÐ ÑÐÐ ÑÐÑÑÐ ÐÐ ÐÐÑÐÐÐÐÐÐ/ÑÐÑÑÐÐÐÐ (multipart/encrypted)"
 
-#: ../em-format/em-format.c:1648
+#: ../em-format/em-format.c:1708
 msgid "Could not parse PGP/MIME message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ PGP/MIME ÐÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ/ÐÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../em-format/em-format.c:1649
+#: ../em-format/em-format.c:1709
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ PGP/MIME ÐÐÑÑÐÐ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ/ÐÐÐÐ ÐÐÑÑÐÑ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../em-format/em-format.c:1827
+#: ../em-format/em-format.c:1891
 msgid "Unsupported signature format"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../em-format/em-format.c:1837 ../em-format/em-format.c:1997
+#: ../em-format/em-format.c:1901 ../em-format/em-format.c:2061
 msgid "Error verifying signature"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../em-format/em-format.c:1838 ../em-format/em-format.c:1985
-#: ../em-format/em-format.c:1998
+#: ../em-format/em-format.c:1902 ../em-format/em-format.c:2049
+#: ../em-format/em-format.c:2062
 msgid "Unknown error verifying signature"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../em-format/em-format.c:2082
-#, fuzzy
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2149
 msgid "Could not parse PGP message: "
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ PGP ÐÐÑÑÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑ:"
 
-#: ../em-format/em-format.c:2088 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2155 ../mail/mail-ops.c:614
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../filter/e-filter-datespec.c:74
+#. 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
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9249,7 +9133,7 @@ msgstr[1] "ÐÑÐ %d ÑÐÐÑÐÐÐ"
 msgstr[2] "ÐÑÐ %d ÑÐÐÑÐÐÐ"
 msgstr[3] "ÐÑÐ %d ÑÐÐÑÐÐÐ"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9258,7 +9142,7 @@ msgstr[1] "%d ÑÐÐÑÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[2] "%d ÑÐÐÑÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[3] "%d ÑÐÐÑÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9267,7 +9151,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÑÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÑÑÐ"
 msgstr[3] "ÐÑÐ %d ÐÐÐÑÑ"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9276,7 +9160,7 @@ msgstr[1] "%d ÐÐÐÑÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[2] "%d ÐÐÐÑÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[3] "%d ÐÐÐÑÑ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9285,7 +9169,7 @@ msgstr[1] "ÐÑÐ %d ÑÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÑÐÑÐ"
 msgstr[3] "ÐÑÐ %d ÑÐÑ"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9294,7 +9178,7 @@ msgstr[1] "%d ÑÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[2] "%d ÑÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[3] "%d ÑÐÑ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9321,7 +9205,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÐÑÐ"
 msgstr[3] "ÐÑÐ %d ÐÐÐÐÑÑ"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9330,7 +9214,7 @@ msgstr[1] "%d ÐÐÐÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[2] "%d ÐÐÐÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[3] "%d ÐÐÐÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9339,16 +9223,16 @@ msgstr[1] "ÐÑÐ %d ÐÐÑÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÑÐÑÐ"
 msgstr[3] "ÐÑÐ %d ÐÐÑÐÑ"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d ÐÐÑÐÑ Ñ ÐÑÐÑÑÐÐÑÑÐ"
-msgstr[1] "%d months in the future"
-msgstr[2] "%d months in the future"
+msgstr[1] "%d ÐÐÑÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
+msgstr[2] "%d ÐÐÑÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑ"
 msgstr[3] "%d ÐÐÑÐÑ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -9357,7 +9241,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐÐÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÐÐÐ"
 msgstr[3] "ÐÑÐ %d ÐÐÐÐÐÑ"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -9366,100 +9250,111 @@ msgstr[1] "%d ÐÐÐÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[2] "%d ÐÐÐÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 msgstr[3] "%d ÐÐÐÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../filter/e-filter-datespec.c:119
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐ>"
 
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "ÑÐÐÐ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "ÐÐÐ Ð_ÑÐÐÐÐÐ:"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "ÐÑÐÐÐÑÐ ÑÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "ÐÐÐÐÑ _ÑÑÐÐÐ"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "ÐÐÐ ÑÑ ÑÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "ÐÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐ ÐÐÐÐÐÐÑÐÐ"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "_ÐÑÐÐÐÑÐ ÑÑÐÐÐÐ:"
 
-#: ../filter/e-filter-rule.c:760
+# 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 not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:749
+msgid "None"
+msgstr "ÐÐÑÑÐ"
+
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "ÐÐÐÐÐÐÑÐ Ð ÐÐÐÑÐÑÐÐÐ"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÑÐÑÐ"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "Ð_ÐÑÑÑÐ ÐÐÑÐ"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "ÐÐÐÐÑ _ÑÑÐÐÐ"
+
+#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "ÐÐÐÐÑ ÐÑÐÐÐÐÐ"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 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."
@@ -9476,7 +9371,7 @@ 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."
@@ -9565,10 +9460,10 @@ msgstr "ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐ"
 msgid "years"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "ÐÑÐÐÐÐ"
@@ -9576,38 +9471,37 @@ msgstr[1] "ÐÑÐÐÐÐÐ"
 msgstr[2] "ÐÑÐÐÐÐÐ"
 msgstr[3] "ÐÑÐÐÐÐ"
 
-#: ../mail/e-mail-attachment-bar.c:586
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
-msgstr "ÐÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-attachment-bar.c:587
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
-msgstr "ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-browser.c:265
-#| msgid "Subject"
+#: ../mail/e-mail-browser.c:267
 msgid "(No Subject)"
-msgstr ""
+msgstr "(ÐÐÐ ÑÑÐÑÐÐÑÐ)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:67
 msgid "_Add to Address Book..."
 msgstr "_ÐÐÐÐÑ Ñ ÐÐÑÐÑÐÑ..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:74
 msgid "_To This Address"
 msgstr "_ÐÐ ÐÐÑ ÐÐÑÐÑÑ"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:81
 msgid "_From This Address"
 msgstr "_ÐÐ ÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:90
 msgid "Create Search _Folder"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ _ÐÑÐÑÑÐÐÐ"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "ÐÐÐÐÐ _ÐÐÐÐÐÐ:"
 
@@ -9639,7 +9533,7 @@ msgid "_Later"
 msgstr "ÐÐÑÐÐ_ÑÐ"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:478
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐÑ"
 
@@ -9652,8 +9546,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:86
 msgid "Color"
@@ -9669,32 +9563,32 @@ msgid "Name"
 msgstr "ÐÐÐ"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../mail/em-folder-tree-model.c:697 ../mail/em-folder-tree.c:2840
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "ÐÐÐÐÑÑÐ"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:689
 msgid "Drafts"
 msgstr "ÐÐÑÑÑÐ"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:701
 msgid "Outbox"
 msgstr "ÐÐ ÑÐÐÑÐ"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:703
 msgid "Sent"
 msgstr "ÐÐÑÐÐÑÐ"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:692
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:573
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
-msgstr "ÐÑÐÐÐÑÐÑÐ..."
+msgstr "ÐÑÐÐÐÑÐÐ..."
 
 #: ../mail/e-mail-migrate.c:164
 msgid "Migration"
@@ -9703,7 +9597,7 @@ msgstr "ÐÑÐÐÐÐÐÐ"
 #: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
-msgstr "ÐÑÐÐÐÑÐÑÐ â%sâ:"
+msgstr "ÐÑÐÐÐÑÐÐ â%sâ:"
 
 #: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
@@ -9716,18 +9610,16 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ÐÐÑÐÐÑ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐÑÐÐ ÑÐ ÐÐ SQLite ÑÐÑ ÐÐ ÐÐÐÐÑÑÐÑÐ 2.24.\n"
+"ÐÐÑÐÐÑ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÐÑÑ ÑÐÑ ÐÐ ÐÐÐÐÑÑÐÑÐ 2.24.\n"
 "\n"
 "ÐÑÐÐÑÐ ÑÑÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ..."
 
-#: ../mail/e-mail-migrate.c:739
+#: ../mail/e-mail-migrate.c:796
 #, c-format
-#| msgid "Unable to create local mail folders at `%s': %s"
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ Ñ â%sâ: %s"
 
 #: ../mail/e-mail-notebook-view.c:563
-#| msgid "Please select a server."
 msgid "Please select a folder"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ."
 
@@ -9739,34 +9631,33 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ."
 msgid "Do not ask me again"
 msgstr "ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:410
 msgid "C_opy"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:648 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ÐÑÐÐÐÑÑÐ Ñ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:648 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:410
 msgid "_Move"
 msgstr "ÐÑÐ_ÐÐÑÑÐ"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:908 ../mail/e-mail-reader.c:1019
-#: ../mail/e-mail-reader.c:1060
-#| msgid "Do not ask me again"
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
 msgid "_Do not ask me again."
 msgstr "_ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ."
 
-#: ../mail/e-mail-reader.c:1065
+#: ../mail/e-mail-reader.c:1116
 msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "_ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ-ÐÐ: ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ."
+msgstr "_ÐÐÐÐ ÐÐÐÐÐÐÑÐ âÐÐÐÐÐÐÑ-ÐÐ:â ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ."
 
-#: ../mail/e-mail-reader.c:1155
+#: ../mail/e-mail-reader.c:1206
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
@@ -9780,7 +9671,7 @@ msgstr[3] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1176
+#: ../mail/e-mail-reader.c:1227
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
@@ -9788,605 +9679,583 @@ msgstr[0] "ÐÐÑÑÐÐ"
 msgstr[1] "ÐÐÑÑÐÐ"
 msgstr[2] "ÐÐÑÑÐÐ"
 msgstr[3] "ÐÐÑÑÐÐ"
-#: ../mail/e-mail-reader.c:1441
+
+#: ../mail/e-mail-reader.c:1492
 msgid "A_dd Sender to Address Book"
 msgstr "ÐÐ_ÐÐÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÐÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1443
+#: ../mail/e-mail-reader.c:1494
 msgid "Add sender to address book"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÐÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1499
 msgid "Check for _Junk"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÐ ÐÐ _ÑÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐ _ÑÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1450
+#: ../mail/e-mail-reader.c:1501
 msgid "Filter the selected messages for junk status"
-msgstr "ÐÐÐÑÑÐÑÐÑ ÐÐ ÐÐ ÐÐÑÑ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÑÐÑÐÑÐ"
+msgstr "ÐÐÐÑÑÐÑÐ ÐÐ ÐÐ ÐÐÑÑ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1455
+#: ../mail/e-mail-reader.c:1506
 msgid "_Copy to Folder..."
 msgstr "_ÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÑ..."
 
-#: ../mail/e-mail-reader.c:1457
+#: ../mail/e-mail-reader.c:1508
 msgid "Copy selected messages to another folder"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1462
+#: ../mail/e-mail-reader.c:1513
 msgid "_Delete Message"
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1464
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages for deletion"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐ ÐÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1520
 msgid "Filter on Mailing _List..."
 msgstr "ÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÑ _ÐÐÑÑÑ..."
 
-#: ../mail/e-mail-reader.c:1471
+#: ../mail/e-mail-reader.c:1522
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:1476
+#: ../mail/e-mail-reader.c:1527
 msgid "Filter on _Recipients..."
 msgstr "ÐÐÐÑÐÑ ÐÐ _ÐÑÐÐÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1478
+#: ../mail/e-mail-reader.c:1529
 msgid "Create a rule to filter messages to these recipients"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐ ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐ ÐÑÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1534
 msgid "Filter on Se_nder..."
 msgstr "ÐÐÐÑÐÑ ÐÐ ÐÐÑ_ÐÑÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1485
+#: ../mail/e-mail-reader.c:1536
 msgid "Create a rule to filter messages from this sender"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1490
+#: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
 msgstr "ÐÐÐÑÐÑ ÐÐ _ÐÐÑÐÐÐ..."
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1543
 msgid "Create a rule to filter messages with this subject"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1548
 msgid "A_pply Filters"
 msgstr "ÐÑÐ_ÐÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1550
 msgid "Apply filter rules to the selected messages"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1555
 msgid "_Find in Message..."
 msgstr "Ð_ÑÐÐÐÑÐ Ñ ÐÐÑÑÑÐ..."
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1557
 msgid "Search for text in the body of the displayed message"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÑÑÐÐÑÑÐ ÑÐÐÑÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1562
 msgid "_Clear Flag"
 msgstr "ÐÐÐÐ_ÐÐ ÐÐÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1564
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1518
+#: ../mail/e-mail-reader.c:1569
 msgid "_Flag Completed"
 msgstr "ÐÐÐÐÑ_Ð ÐÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1571
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1576
 msgid "Follow _Up..."
 msgstr "ÐÐÐ_ÐÐ..."
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1578
 msgid "Flag the selected messages for follow-up"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1583
 msgid "_Attached"
 msgstr "ÐÑÐ_ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1534 ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1539
+#: ../mail/e-mail-reader.c:1590
 msgid "Forward As _Attached"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐ _ÐÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1597
 msgid "_Inline"
 msgstr "ÐÐÑÑ_ÐÑ"
 
-#: ../mail/e-mail-reader.c:1548 ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
 msgid "Forward the selected message in the body of a new message"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ Ñ ÑÐÐÑ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1604
 msgid "Forward As _Inline"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐ _ÑÐÑÑÐÑ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1611
 msgid "_Quoted"
 msgstr "_ÐÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1562 ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
 msgid "Forward the selected message quoted like a reply"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÑÐÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1567
+#: ../mail/e-mail-reader.c:1618
 msgid "Forward As _Quoted"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐ _ÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1625
 msgid "_Load Images"
 msgstr "_ÐÑÐÑÐÑ ÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1627
 msgid "Force images in HTML mail to be loaded"
-msgstr "ÐÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ Ñ HTML ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ Ñ ÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1632
 msgid "_Important"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1634
 msgid "Mark the selected messages as important"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1588
+#: ../mail/e-mail-reader.c:1639
 msgid "_Junk"
 msgstr "_ÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1641
 msgid "Mark the selected messages as junk"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:1595
+#: ../mail/e-mail-reader.c:1646
 msgid "_Not Junk"
 msgstr "ÐÐ_ÑÐ ÑÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1648
 msgid "Mark the selected messages as not being junk"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1653
 msgid "_Read"
 msgstr "ÐÑÐ_ÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1655
 msgid "Mark the selected messages as having been read"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1609
+#: ../mail/e-mail-reader.c:1660
 msgid "Uni_mportant"
 msgstr "ÐÐ_ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1662
 msgid "Mark the selected messages as unimportant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1616
+#: ../mail/e-mail-reader.c:1667
 msgid "_Unread"
 msgstr "_ÐÐÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1669
 msgid "Mark the selected messages as not having been read"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1623
+#: ../mail/e-mail-reader.c:1674
 msgid "_Edit as New Message..."
 msgstr "_ÐÑÐÐÐ ÐÐÐ ÐÐÐÑ ÐÐÑÑÐÑ..."
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1676
 msgid "Open the selected messages in the composer for editing"
 msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÑÐÑÑ ÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1630
+#: ../mail/e-mail-reader.c:1681
 msgid "Compose _New Message"
 msgstr "ÐÐÑÑÐÐÐ _ÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1683
 msgid "Open a window for composing a mail message"
-msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1637
+#: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
 msgstr "_ÐÑÐÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1690
 msgid "Open the selected messages in a new window"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../mail/e-mail-reader.c:1644
+#: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
 msgstr "_ÐÑÐÐÐÑÑÐ Ñ ÑÐÑÑÐÐÐÑ..."
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1697
 msgid "Move selected messages to another folder"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1651
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1702
 msgid "_Switch to Folder"
 msgstr "ÐÑÐÑÐ Ñ _ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1653
-#, fuzzy
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:1704
 msgid "Display the parent folder"
-msgstr "ÐÐÑÑÐÐÐÑÐÑ ÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1658
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1709
 msgid "Switch to _next tab"
-msgstr "ÐÑÐÑÐ ÐÐ %s"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1711
 msgid "Switch to the next tab"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1665
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1716
 msgid "Switch to _previous tab"
-msgstr "ÐÑÐÑÐ ÐÐ %s"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1718
 msgid "Switch to the previous tab"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1672
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:1723
 msgid "Cl_ose current tab"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "_ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1674
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:1725
 msgid "Close current tab"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1679
+#: ../mail/e-mail-reader.c:1730
 msgid "_Next Message"
 msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1732
 msgid "Display the next message"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1686
+#: ../mail/e-mail-reader.c:1737
 msgid "Next _Important Message"
 msgstr "ÐÐÐÐÐÑÐ _ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1739
 msgid "Display the next important message"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1693
+#: ../mail/e-mail-reader.c:1744
 msgid "Next _Thread"
 msgstr "_ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1746
 msgid "Display the next thread"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÑÐÑÐÑÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1700
+#: ../mail/e-mail-reader.c:1751
 msgid "Next _Unread Message"
 msgstr "ÐÐÐÐÐÑÐ _ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1753
 msgid "Display the next unread message"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1707
+#: ../mail/e-mail-reader.c:1758
 msgid "_Previous Message"
 msgstr "_ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1760
 msgid "Display the previous message"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1714
+#: ../mail/e-mail-reader.c:1765
 msgid "Pr_evious Important Message"
 msgstr "ÐÑ_ÐÑÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1767
 msgid "Display the previous important message"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1721
+#: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
 msgstr "Ð_ÑÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1781
 msgid "Print this message"
 msgstr "ÐÑÐÐÐÐÑ ÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1788
 msgid "Preview the message to be printed"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑ ÐÑÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐ ÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1742
+#: ../mail/e-mail-reader.c:1793
 msgid "Re_direct"
 msgstr "ÐÑÐÑ_ÑÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1795
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "ÐÑÐÑ_ÑÐÐÑÐÐÐ (ÐÐÐ ÑÐÑÐÑÐ) ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÑÑÐÐÑÐÐÐ (ÐÐÐ ÑÐÑÐÑÐ) ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1749 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:139
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "ÐÐÐÐÐÐÑÐ _ÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1802
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1756 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ _ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1809
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1763
-#: ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "_ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÑ"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1816
 msgid "Compose a reply to the sender of the selected message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1770
+#: ../mail/e-mail-reader.c:1821
 msgid "_Save as mbox..."
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ mbox..."
+msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÑ..."
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1823
 msgid "Save selected messages as an mbox file"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐÐ mbox ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐÐ âmboxâ ÐÐÑÐÑÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1828
 msgid "Search Folder from Mailing _List..."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ _ÐÐÑÑÑ..."
 
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:1830
 msgid "Create a search folder for this mailing list"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1835
 msgid "Search Folder from Recipien_ts..."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐ_ÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1837
 msgid "Create a search folder for these recipients"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1842
 msgid "Search Folder from Sen_der..."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ _ÐÐÑÐÑÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1844
 msgid "Create a search folder for this sender"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1849
 msgid "Search Folder from S_ubject..."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ Ð_ÐÑÐÐÐ..."
 
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1851
 msgid "Create a search folder for this subject"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1856
 msgid "_Message Source"
 msgstr "ÐÐÐÐ_ÑÐÐ ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1858
 msgid "Show the raw email source of the message"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
 msgstr "Ð_ÐÐÑÐÑÐ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1872
 msgid "Undelete the selected messages"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1877
 msgid "_Normal Size"
 msgstr "_ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1879
 msgid "Reset the text to its original size"
-msgstr "ÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ"
+msgstr "ÐÑÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1884
 msgid "_Zoom In"
 msgstr "ÐÐ_ÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1886
 msgid "Increase the text size"
-msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÑÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1891
 msgid "Zoom _Out"
 msgstr "Ð_ÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1893
 msgid "Decrease the text size"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1900
 msgid "Create R_ule"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐ_ÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1907
 msgid "Ch_aracter Encoding"
 msgstr "ÐÐÐÐÐ ÑÑ_ÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1914
 msgid "F_orward As"
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1870
-#, fuzzy
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:1921
 msgid "_Group Reply"
-msgstr "Ð_ÐÐÐÐÐÑÐ"
+msgstr "Ð_ÐÐÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1928
 msgid "_Go To"
 msgstr "_ÐÐÐ ÐÐ"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1935
 msgid "Mar_k As"
 msgstr "Ð_ÐÐÐÑÐ ÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1942
 msgid "_Message"
 msgstr "_ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1949
 msgid "_Zoom"
 msgstr "ÐÐ_ÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1974
 msgid "Mark for Follo_w Up..."
 msgstr "ÐÐÐÐÐÐÐ ÐÐ _ÐÑÐÑÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1982
 msgid "Mark as _Important"
 msgstr "ÐÐÐÑÐ ÐÐÐ _ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Junk"
 msgstr "ÐÐÐÐÑÐ ÐÐÐ _ÑÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Not Junk"
 msgstr "ÐÐÐÐÑÐ ÐÐ _ÐÐÑÐ ÑÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1994
 msgid "Mar_k as Read"
 msgstr "Ð_ÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark as Uni_mportant"
 msgstr "ÐÐÐÐÑÐ ÐÐÐ _ÐÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as _Unread"
 msgstr "ÐÐÐÐÑÐ ÐÐÐ _ÐÐÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2038
 msgid "_Caret Mode"
 msgstr "ÐÐÑÐÐ Ñ_ÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:2040
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑÑÑÐ ÐÑÑÑÐÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÑÐÐÑÑÑÐ ÐÑÑÑÐÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2046
 msgid "All Message _Headers"
 msgstr "ÐÐÐ _ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2048
 msgid "Show messages with all email headers"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÑ ÑÐ ÑÐÐÐ ÐÐÐÐÐÐÑÐÐÐ Ð-ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÐÑ ÑÐ ÑÐÐÐ ÐÐÐÐÐÐÑÐÐÐ Ð-ÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2269
 msgid "Unable to retrieve message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1896
 #, 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:2838 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2913 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3007
-#: ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:3061
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "ÐÑÐÑÐ_ÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3008
+#: ../mail/e-mail-reader.c:3062
 msgid "Forward the selected message to someone"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#. Likewise the "mail-reply-group" action
-#. For Translators: "Group Reply" will reply either to a mailing list
-#. (if possible and if that configuration option is enabled), or else
-#. it will reply to all. The word "Group" was chosen because it covers
-#. either of those, without too strongly implying one or the other.
-#: ../mail/e-mail-reader.c:3026
-#, fuzzy
-#| msgid "Group Items By"
+#: ../mail/e-mail-reader.c:3081
 msgid "Group Reply"
-msgstr "ÐÑÑÐÐÑÐ ÑÑÐÐÐÐ ÐÐ"
+msgstr "ÐÐÐÐÐÐÑ ÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:3027
-#, fuzzy
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3082
 msgid "Reply to the mailing list, or to all recipients"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3072 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3127 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:3104
+#: ../mail/e-mail-reader.c:3160
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../widgets/misc/e-calendar.c:193
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ÐÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:3108
+#: ../mail/e-mail-reader.c:3164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
-#: ../widgets/misc/e-calendar.c:169
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ÐÑÐÑÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3118 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3174 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:3730
-#, fuzzy, c-format
-#| msgid "Folder"
+#: ../mail/e-mail-reader.c:3742
+#, c-format
 msgid "Folder '%s'"
-msgstr "ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐ â%sâ"
 
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
@@ -10394,33 +10263,33 @@ 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:508 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:513 ../mail/mail-config.ui.h:77
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
-msgstr "ÐÐ ÐÐÑÐÑÑÐ ÑÐ ÑÐÑÑÐÐÐÑÐ"
+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:512 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:517 ../mail/mail-config.ui.h:136
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
-msgstr "TLS ÑÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
 #. 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:516 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:521 ../mail/mail-config.ui.h:105
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
-msgstr "SSL ÑÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../mail/em-account-editor.c:603
+#: ../mail/em-account-editor.c:608
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ÑÐÐÐÐÑ Ð ÐÐÑÐÐÑÐ"
 
-#: ../mail/em-account-editor.c:610
+#: ../mail/em-account-editor.c:615
 #, c-format
 msgid ""
 "\n"
@@ -10439,20 +10308,20 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:902 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../mail/em-account-editor.c:981
+#: ../mail/em-account-editor.c:986
 msgid "Never"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../mail/em-account-editor.c:982
+#: ../mail/em-account-editor.c:987
 msgid "Always"
 msgstr "ÐÐÐÐ"
 
-#: ../mail/em-account-editor.c:983
+#: ../mail/em-account-editor.c:988
 msgid "Ask for each message"
 msgstr "ÐÐÑÐÑ ÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
 
@@ -10462,16 +10331,16 @@ msgstr "ÐÐÑÐÑ ÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1726 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2104
 msgid "Mail Configuration"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10479,55 +10348,55 @@ msgid ""
 msgstr ""
 "ÐÐÐÑÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ ÐÐÐÐÑÑÐÑÐ.\n"
 "\n"
-"ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÐÑÐÐ. "
+"ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÐÐÑÐÐÑÐ. "
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2108
 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:2101 ../mail/em-account-editor.c:2258
+#: ../mail/em-account-editor.c:2110 ../mail/em-account-editor.c:2267
 #: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2111
 msgid "Please configure the following account settings."
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
+#: ../mail/em-account-editor.c:2113 ../mail/em-account-editor.c:2758
 msgid "Sending Email"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2114
 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:2107
+#: ../mail/em-account-editor.c:2116
 msgid "Account Management"
 msgstr "ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2117
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ.\n"
+"ÐÐÐÑÐÑÐ ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ.\n"
 "ÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÐÑÐÐÐÐ."
 
-#: ../mail/em-account-editor.c:2112
+#: ../mail/em-account-editor.c:2121
 msgid "Done"
-msgstr "ÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐ"
 
-#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2122
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10537,52 +10406,50 @@ msgid ""
 msgstr ""
 "ÐÐÑÑÐÑÐÐÐ, ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ ÑÐ ÐÐÐÑÑÐÐÐ.\n"
 "\n"
-"ÐÐÐÐ ÑÑÐ ÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÑÐÑÐ.\n"
+"ÐÐÐÐ ÑÑÐ ÑÐÑÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÑÐÑÑ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ.\n"
 "\n"
 "ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐâ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÑÑÐÐÐÐ."
 
-#: ../mail/em-account-editor.c:2554
+#: ../mail/em-account-editor.c:2572
 msgid "Check for _new messages every"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2562
+#: ../mail/em-account-editor.c:2580
 msgid "minu_tes"
 msgstr "ÐÐÐÑ_ÑÐ"
 
-#: ../mail/em-account-editor.c:2838
-#, fuzzy
-#| msgid "Please select an image for this contact"
+#: ../mail/em-account-editor.c:2856
 msgid "Please select a folder from the current account."
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐ ÐÐÐÐÐÐ."
 
-#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3126 ../mail/mail-config.ui.h:112
 msgid "Security"
-msgstr "ÐÐÐÑÑÐÐÑÑ"
+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:3153 ../mail/em-account-editor.c:3221
+#: ../mail/em-account-editor.c:3171 ../mail/em-account-editor.c:3239
 msgid "Receiving Options"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
+#: ../mail/em-account-editor.c:3172 ../mail/em-account-editor.c:3240
 msgid "Checking for New Messages"
 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:1539
+#: ../mail/em-composer-utils.c:1735
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "ÐÐÑÐ ÐÐÑÑÐÐ ÐÐ %s ÐÐ ÑÐÐÑ â%sâ ÐÐ %s ÑÐ ÐÑÐÑÐÑÐÐÐ."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1587
+#: ../mail/em-composer-utils.c:1783
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÑÐÐÑ ÐÐ: â%sâ"
 
-#: ../mail/em-composer-utils.c:1991
+#: ../mail/em-composer-utils.c:2192
 msgid "an unknown sender"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ"
 
@@ -10591,7 +10458,7 @@ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2038
+#: ../mail/em-composer-utils.c:2239
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10599,21 +10466,21 @@ msgstr ""
 "Ð ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. Ñ ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} ÐÐÑÐ:"
 
-#: ../mail/em-composer-utils.c:2182
+#: ../mail/em-composer-utils.c:2383
 msgid "-----Original Message-----"
 msgstr "-----ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ-----"
 
-#: ../mail/em-composer-utils.c:2372
+#: ../mail/em-composer-utils.c:2595
 msgid "Posting destination"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐÑÑÐ"
 
-#: ../mail/em-composer-utils.c:2373
+#: ../mail/em-composer-utils.c:2596
 msgid "Choose folders to post the message to."
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐÑÑÐÐ."
 
 #: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10630,7 +10497,7 @@ msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÑÐÑ"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
-msgstr "BCC"
+msgstr "ÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
@@ -10638,7 +10505,7 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "CC"
-msgstr "CC"
+msgstr "ÐÐ"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -10698,7 +10565,7 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:29
 msgid "Forward to"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "Important"
@@ -10787,7 +10654,7 @@ msgstr "ÐÑÐÐÐÐÑÐ"
 
 #: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
-msgstr "Regex ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
@@ -10921,7 +10788,7 @@ msgstr "_ÐÐÐ ÑÐÑÑÐÐÐÐ:"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
@@ -10930,101 +10797,82 @@ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 msgid "UNMATCHED"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
+#: ../mail/em-folder-tree-model.c:767 ../mail/em-folder-tree-model.c:1114
 msgid "Loading..."
-msgstr "ÐÑÐÑÐÐÐÑÐ..."
+msgstr "ÐÑÐÑÐÐÐÐ..."
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:191
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:611
 msgid "Folder names cannot contain '/'"
-msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ â/â"
-
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ â/â"
+
+#: ../mail/em-folder-tree.c:1100
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1339
 msgid "Mail Folder Tree"
 msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1656 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1660 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1669 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ %s"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1673 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ %s"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1690
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐÑÐ ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:411
 msgid "Move Folder To"
 msgstr "ÐÑÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ Ñ"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:411
 msgid "Copy Folder To"
 msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ Ñ"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
-#, fuzzy, c-format
-#| msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:541
+#: ../plugins/groupwise-features/share-folder-common.c:137
+#, c-format
 msgid "Creating folder '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:701
 msgid "Create Folder"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/em-folder-utils.c:694
+#: ../mail/em-folder-utils.c:702
 #: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Specify where to create the folder:"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ:"
 
-#: ../mail/em-folder-utils.c:714
+#: ../mail/em-folder-utils.c:722
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÑÐÐÑÑÑÐÐ ÑÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
 #: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
@@ -11034,7 +10882,7 @@ msgstr "ÐÐÐÐÑÐÐÑÐÐÐ"
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐÐÐ. ÐÐÑÐ ÑÐÐÑÑÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÑÐÐÑÐÑÐÐ."
+msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐÐÐ. ÐÐÑÐ ÑÐÐÑÑÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐÑÐÐ."
 
 #: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
@@ -11046,7 +10894,7 @@ msgid ""
 "message is authentic."
 msgstr ""
 "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÑÐÐÑÐÐÐ Ð ÐÑÐÑÐÐÐÐ ÑÑÐ ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ ÐÑÐÐ "
-"ÐÐÑÐÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐ."
+"ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÑÑÐÑÐÐ."
 
 #: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
@@ -11130,21 +10978,21 @@ msgstr ""
 "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÑÑÐÐÐÐÐ, ÑÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ. ÐÐÐÐÐ ÑÐ ÑÐÑÐÐ ÐÐ ÐÐÐÐ ÑÐ ÑÑÑÐÐÐ "
 "Ñ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
-msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÐÑÐÑÐ"
 
 #: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
-msgstr "ÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑ ÐÐÑÐ ÑÐÑÑÐÐ"
+msgstr "ÐÐÐ ÑÐÐÑÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐ"
 
 #: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
-"ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÑÑÑÐ ÐÐÐ ÐÐÑÐÐ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ "
-"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÑ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÑÐ."
+"ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐÐÐÑÐ ÑÐ "
+"ÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÑÑ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÑÐ."
 
 #: ../mail/em-format-html-display.c:725
 msgid "Completed on"
@@ -11159,15 +11007,15 @@ msgstr "ÐÑÐÐÐÑÐÑÐÐÐ:"
 msgid "by"
 msgstr "ÐÐ"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "ÐÑÐÐÐÐÐÐÑ _ÐÐÑÐÑÐÐÑÐÑÐÐÐ"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "ÐÐÐÑÐÑ _ÐÐÑÐÑÐÐÑÐÑÐÐÐ"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "Ð_ÑÐÐÑÐ ÐÐÐÐÑÑ"
 
@@ -11182,61 +11030,58 @@ msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ..."
+msgstr "ÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÑ..."
 
 #: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
-#, fuzzy, c-format
-#| msgid "Retrieving `%s'"
+#, c-format
 msgid "Retrieving '%s'"
-msgstr "ÐÐÐÐÐÑÐÑÐ â%sâ"
+msgstr "ÐÐÐÐÐÑÐÐ â%sâ"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1911
 msgid "Unknown external-body part."
 msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1919
 msgid "Malformed external-body part."
 msgstr "ÐÐÑÐ ÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to FTP site (%s)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ FTP ÑÑÑÐÐÐÑÑ (%s)"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐ ÑÑÑÐÐÐÑÑ (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:1960
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s) ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÐÑÐ â%sâ"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:1962
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:1983
 #, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑÐÐ (%s)"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:1994
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ (ÑÐÐÐ â%sâ)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
-#, fuzzy, c-format
-#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+#: ../mail/em-format-html.c:2657
+#, c-format
 msgid "This message was sent by %s on behalf of %s"
-msgstr "ÐÐÑÑÐÑ ÑÐÑÐ <b>%s</b> Ñ ÐÐÐ <b>%s</b>"
+msgstr "ÐÐÑÑÐÑ ÑÐÑÐ %s Ñ ÐÐÐ %s"
 
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
-#, fuzzy, c-format
-#| msgid "No summary available."
+#, c-format
 msgid "No HTML stream available"
-msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÐÑÐÐ."
+msgstr "ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐÐ ÑÐÐ."
 
 #: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -11257,24 +11102,23 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÐÐÑ."
 
 #: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐ ÑÐÑÐÐÑ"
+msgstr "ÐÐÑÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÑÐÐ"
 
-#. Translators: This message is shown only for ten or more messages to be opened.
-#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
-#. then write it doubled, like '%%'.
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
 #: ../mail/em-utils.c:106
-#, fuzzy, c-format
-#| msgid "Are you sure you want to open {0} messages at once?"
-msgid "Are you sure you want to open %d messages at once?"
+#, 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] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ {0} ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
-msgstr[1] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ {0} ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
-msgstr[2] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ {0} ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
+msgstr[0] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑ %d ÐÐÑÑÐÑ?"
+msgstr[1] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %d ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
+msgstr[2] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %d ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
+msgstr[3] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑ ÑÐÐÐÑ ÐÐÑÑÐÑ?"
 
 #: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
-#, fuzzy
-#| msgid "_Do not show this message again."
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_ÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑ."
 
@@ -11285,7 +11129,7 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 #: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
-msgstr "ÐÐÑÑÐÐ ÐÐ %s"
+msgstr "ÐÐÑÑÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÐÐ %s"
 
 #: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
@@ -11297,39 +11141,39 @@ 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 "\"Search Folder Editor\" window height"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ"
+msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "\"Search Folder Editor\" window width"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ"
+msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:10
 msgid "Always request read receipt"
@@ -11337,7 +11181,7 @@ msgstr "ÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÑÐÐÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
-msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐ"
+msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
@@ -11345,7 +11189,7 @@ msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÑÑÐÑÐ"
+msgstr "ÐÑÑÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐ ÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
@@ -11353,7 +11197,7 @@ msgstr "ÐÐÑÐ ÐÑÑÐÑÐÑÐ ÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
-msgstr "ÐÐÑÐ ÐÑÑÐÑÐÑÐ ÑÐÑÐÑÐ."
+msgstr "ÐÐÑÐ ÐÐ ÐÑÑÐÑÐÑÐ ÑÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
@@ -11361,7 +11205,7 @@ msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÑÐ
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑ ÑÐÑÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
@@ -11369,13 +11213,15 @@ msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ/Ð
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC"
+msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC ÐÐ ÐÑÐÑ ÐÐÑÐÑÐÐ Ñ address_count."
+msgstr ""
+"ÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC ÐÐ ÐÑÐÑ ÐÐÑÐÑÐÐ Ñ address_count "
+"(ÐÑÐÑ ÐÐÑÐÑÐ)."
 
 #: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
@@ -11395,7 +11241,7 @@ msgid ""
 "in the format \"headername=value\"."
 msgstr ""
 "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ. ÐÐÐÐÐÐÑÐ "
-"ÑÐÐÑÐÐ ÑÑ ÐÐÐ ÑÐÑÐÐÑÐ âheadername=valueâ."
+"ÑÐÐÑÐÐ ÑÑ ÐÐÐ ÑÐÑÐÐÑÐ âheadername=valueâ (ÐÐÐ ÐÐÐÐÐÐÑÐ=ÐÑÐÐÐÐÑÑ)."
 
 #: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
@@ -11458,12 +11304,12 @@ msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
-"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ "
+"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ "
 "ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
-msgstr "ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
@@ -11472,9 +11318,9 @@ msgid ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÑÑÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ. ÐÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐ, "
+"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐ ÐÑÐÑÑÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ. ÐÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐ, "
 "ÐÐ ÑÐÑÑÑÐÐÐ ÑÐ Ñ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ. ÐÑÐÐÐ ÑÐ Ñ ÐÐÑÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ "
-"ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ. ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐ ÐÐÐ ÑÑ ÐÐÑÐÑÐÑÐ (ÑÐÑÐÐÐ LDAP) ÐÐÐÐÑÐÐÐ ÐÐ "
+"ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ. ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐ ÐÐÐ ÑÑ ÐÐÑÐÑÐÑÐ (ÑÐÑÐÐÐ ÐÐÐÐ) ÐÐÐÐÑÐÐÐ ÐÐ "
 "ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:42
@@ -11497,7 +11343,7 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÑÑÐ ÑÐÐÑ Ñ ÐÐÑÐÐÐ âÐÐÑÐâ and âÐÐÑÐÐÐâ Ñ ÑÑÐÑÐÐÐÐÐ "
+"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÑÑÐ ÑÐÐÑ Ñ ÐÐÑÐÐÐ âÐÐÑÐâ Ð âÐÐÑÐÐÐâ Ñ ÑÑÐÑÐÐÐÐÐ "
 "ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐ âÐÐÑÑÐÐâ."
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -11514,11 +11360,11 @@ msgstr "ÐÑÐÑÑÑÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÑÐÑÐÑÐÐÐÑÐ ÐÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Display only message texts not exceeding certain size"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐ ÑÐÐÑÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ ÑÐÐÑÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
-msgstr "ÐÐ ÐÐÐÐÑ ÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
@@ -11545,12 +11391,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:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÐÐÑÐ, ÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÑÑÐÐÑ ÐÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐÑ."
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÑÐÑÐ, ÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÑÑÑÐÑ ÐÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
@@ -11562,7 +11408,7 @@ msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐ ÐÑÐÑÑÑÑÑÐ ÑÐÐÐÐÑÐÑÐ ÐÑÐ Ð
 
 #: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
-msgstr "ÐÐÑÑÑÐ ÐÐÐ ÐÑÐÑÑÑÐ ÐÐÐÑÑÐÐÑÑ ÑÑÐÐÐÑÐ ÐÑÑÐÑÐ Ñ ÐÐÐÑÐÐ"
+msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐ ÐÑÐÑÑÑÑÑÐ ÐÐÐÑÑÐÐÑÑ ÑÑÐÐÐÑÐ ÐÑÑÐÑÐ ÑÐÐÐÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
@@ -11577,7 +11423,7 @@ msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
-"ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ ÑÑÐÐÐ, ÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐÐÑÑ Ñ ÐÑÐÑÑÐÐÐ "
+"ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ ÐÐÐÑÑÐ, ÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐÐÑÑ Ñ ÐÑÐÑÑÐÐÐ "
 "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:63
@@ -11593,22 +11439,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:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
+"ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:66
-#, fuzzy
-#| msgid ""
-#| "Enable this to use Space bar key to scroll in message preview, message "
-#| "list and folders."
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
-"ÐÐÑÑÑÐÑÐ ÐÐÐ ÐÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÑ ÐÐÑÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÑÑ, ÐÐÐ Ð "
-"ÑÐÐÑÐÐ ÐÐÑÑÐÐ Ð ÑÐÑÑÐÐÐÐ."
+"ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
@@ -11616,7 +11458,7 @@ msgstr "ÐÐÑÑÑÑÑÐ/ÐÑÐÑÑÑÑÑÐ ÐÑÐÐÐÐ ÐÑÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
-msgstr "ÐÐÐÐÑÐÑ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ Outlook/GMail ÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ ÐÑÑÐÑÐÐ/ÐÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
@@ -11625,17 +11467,17 @@ 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:70
 msgid "Flush Outbox after filtering"
-msgstr ""
+msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Group Reply replies to list"
-msgstr ""
+msgstr "ÐÑÑÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
@@ -11643,7 +11485,7 @@ msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
-msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐÑÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
@@ -11654,8 +11496,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:76
 msgid ""
@@ -11663,36 +11505,36 @@ 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:77
 msgid "Ignore list Reply-To:"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÑÑÐ ÐÐÑÑÑ âÐÐÐÐÐÐÑ-ÐÐ:â"
 
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
-"ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
+"ÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
-"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
+"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
+"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
 "ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:81
@@ -11702,10 +11544,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:82
 msgid ""
@@ -11714,8 +11556,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 ""
-"ÐÐÑÐÑÐÐ ÑÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ "
-"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
+"ÐÐÑÐÑÐÐ ÑÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÑÐÐÐÐÑÑ ÑÐ "
+"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
 "ÐÐÑÐÑÑÐ ÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐÑ ÐÑÑÑ ÑÐÐÐ "
 "ÑÐÐÑÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ."
 
@@ -11727,34 +11569,34 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ. ÐÑÐÐÐÐÑÑ ÑÐ "
-"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
-"ÐÐÑÐÑÑÐ ÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐ ÐÑÐÐÐÐÑÑ "
-"ÑÐÐÐ ÑÐÐÑÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ."
+"ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
+"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÑ "
+"ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÐ ÑÐÐÑÐÑÑÑÑÐ "
+"ÐÐÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
-"ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
+"ÐÐÑÐÑÐÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
-"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
+"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
-"ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
+"ÐÐÑÐÑÐÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
@@ -11763,6 +11605,9 @@ msgid ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
+"ÐÐÐÑÑÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐ, ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐ "
+"âÐÐÐÐÐÐÑ ÐÑÑÐÐâ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐ ÐÐÑÐ ÑÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ "
+"ÐÐÑÑÐ ÐÑÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÑ ÐÐÐÐÐÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
@@ -11771,26 +11616,22 @@ msgid ""
 "the search results."
 msgstr ""
 "ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ "
-"ÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐ, Ð ÐÐ ÑÐÐÐ ÑÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ. "
+"ÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐ, Ð ÐÐ ÑÐÐÐ ÑÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:89
-#, fuzzy
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that deleting messages "
-#| "from a search folder permanently deletes the message, not simply removing "
-#| "it from the search results."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr ""
-"ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ "
-"ÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐ, Ð ÐÐ ÑÐÐÐ ÑÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ. "
+"ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐ "
+"ÐÐÑÑÐÑ ÐÐÑÐ ÑÐ ÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
+"ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐ ÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
@@ -11798,16 +11639,15 @@ 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:92
-#, fuzzy
-#| msgid "Last time empty junk was run"
 msgid "Last time Empty Junk was run"
 msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:93
-#, fuzzy
-#| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ"
 
@@ -11821,7 +11661,7 @@ msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÐ Ð ÑÐÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "ÐÐÑÑÐ MIME ÑÐÐÐÐÐ ÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ Bonobo ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐ ÐÐÐÐ ÑÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
@@ -11841,7 +11681,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
-msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÑ ÐÐÐÐÐÐÑÐ Ð ÐÐ ÐÐ ÑÑ ÑÐÑÑÑÐÐÐ."
+msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐ Ð ÐÐ ÐÐ ÑÑ ÑÐÑÑÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
@@ -11853,7 +11693,7 @@ msgid ""
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "ÐÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ. ÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐ "
-"ÐÐÐÐÐÐ ÐÐÐ:ÐÐÑÐ ÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐ HTML hex ÐÐÐÐÑÐÑÐ."
+"ÐÐÐÐÐÐ ÐÐÐ:ÐÐÑÐ ÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
@@ -11861,7 +11701,7 @@ msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÑÐÐÐÐÐ ÑÐÑÐ ÑÐ ÐÐÑÐÐÑÐ
 
 #: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
-msgstr "ÐÑÐÑÐÐÐ ÑÐÐÐÐ ÐÐ HTML ÐÐÑÑÐÐ ÐÑÐÐÐ HTTP-Ð"
+msgstr "ÐÑÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÐÐ-Ð"
 
 #: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
@@ -11869,13 +11709,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:107
 msgid "Log filter actions"
-msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐ ÑÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐ ÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
@@ -11903,11 +11743,11 @@ msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
@@ -11918,16 +11758,14 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:118
-#, fuzzy
-#| msgid "Message Display"
 msgid "Message text limit for display"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐÑÐ ÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"ÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ (ânormalâ ÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐ; âfull headersâ ÐÐ ÐÑÐÐÐÐ "
-"ÑÐÐÑ ÐÐÐÐÐÐÑÐ; âsourceâ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐ)"
+"ÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ (normal â ÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐ; full headers â ÐÐ ÐÑÐÐÐÐ "
+"ÑÐÐÑ ÐÐÐÐÐÐÑÐ; source â ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐ)"
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
@@ -11947,7 +11785,7 @@ msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ ÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "ÐÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐ Ñ TO/CC/BCC"
+msgstr "ÐÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐ Ñ ÐÐ/ÐÐ/ÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
@@ -11964,25 +11802,19 @@ msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:129
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when mailing list hijacks private replies"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:130
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when replying privately to list messages"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÑÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:131
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÐ Bcc ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
@@ -11990,7 +11822,7 @@ msgstr "ÐÐÑÐ ÐÑÐ ÐÑÐÐÑÐÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
-msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐ ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑ (Bcc)"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐ ÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (Bcc)"
 
 #: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
@@ -12001,8 +11833,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:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -12010,7 +11842,7 @@ msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ HTML"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
@@ -12018,7 +11850,7 @@ msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÑÑ ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÑÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
@@ -12026,7 +11858,7 @@ msgstr "ÐÐÑÑÐÐÑÐ ÐÑÑÑÐÑ ÐÐ ÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
-msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐ Ñ ÑÐÐÑÑÑ Ð ÐÐÐÐÑÑÑÐ ÐÑ ÑÐÐÐÐÐÐ."
+msgstr "ÐÑÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ Ñ ÑÐÐÑÑÑ Ð ÐÐÐÐÑÑÑÐ ÐÑ ÑÐÐÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
@@ -12038,7 +11870,7 @@ msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐ ÑÑÐÑÐÑÐ Ñ ÐÐÐÐÐÐÐÑ 
 
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
@@ -12046,55 +11878,55 @@ msgstr "ÐÑÐÐÐ ÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑ
 
 #: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐ ÐÐÑÑÑ ÐÐÐ HTML"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐ ÐÐÑÑÑ ÐÐÐ HTML."
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÑ ÑÐ Ð-ÐÐÑÐÑÐÐÐ  Ñ ÑÐÐÑÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÐÐÐ Ð-ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ Ñ ÑÐÐÑÐÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
-msgstr "ÐÐÑÐÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
-"ÐÐÑÑÐÐÐÑÐ ÐÐ TRUE Ñ ÑÐÑÑÐÑÑ ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐ ÐÐÑÐÐÑÐ "
-"ÐÑÐ ÐÐÑÐÑÑ. "
+"ÐÐÐÐÐÑÐÑÐ ÐÐÑ ÐÐÑÐÑÑ Ñ ÑÐÑÑÐÑÑ ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐ "
+"ÐÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑÐÐ. "
 
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âBccâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âBccâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âCcâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âCcâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âÐÐÑÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âÐÐÑÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÐÐÐ ÑÐÑÐ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÐÐÐ ÑÐÑÐ ÐÐÑÑÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
@@ -12110,19 +11942,19 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐ
 
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÑÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ Ñ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÑÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑ âÐÐÑÑÐâ."
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
-msgstr "ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
@@ -12161,7 +11993,7 @@ msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÑÑÐÐ. ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ "
+"ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ. ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ "
 "âÐÑÐÐÐÐÐâ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:170
@@ -12194,10 +12026,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:174
 msgid "Spell check inline"
-msgstr "ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÑÐÑÑÐÑ"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
@@ -12224,18 +12063,18 @@ msgid "The default plugin for Junk hook"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐ ÐÐ ÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:181
-#, fuzzy
-#| msgid "The last time empty junk was run, in days since the epoch."
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐ."
+msgstr ""
+"ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÐÑÑ ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ 1. ÑÐÐÑÐÑÐ, 1970 "
+"(ÐÐÐÑ)."
 
 #: ../mail/evolution-mail.schemas.in.h:182
-#, fuzzy
-#| msgid "The last time empty trash was run, in days since the epoch."
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐ."
+msgstr ""
+"ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÐÑÑ ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ 1. ÑÐÐÑÐÑÐ, 1970 "
+"(ÐÐÐÑ)."
 
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
@@ -12244,9 +12083,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:184
 msgid "The terminal font for mail display."
@@ -12261,22 +12100,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:187
-#, fuzzy
-#| msgid ""
-#| "This decides the max size of the text part that can be formatted under "
-#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
 "is used only when 'force_message_limit' key is activated."
 msgstr ""
-"ÐÐÐ ÐÐÑÐÑÑÑÐ ÐÐÑÐÐÑÑ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÐ ÑÐÑÐÐÑÐÑÐÐ Ñ "
-"ÐÐÐÐÑÑÐÑÐ. ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ 4MB / 4096 KB Ð ÐÐÐÐÐÐÐÐ ÑÐ ÐÐÐ ÐÑÐÑ KB."
+"ÐÐÐ ÐÐÑÐÑÑÑÐ ÐÐÑÐÐÑÑ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ Ñ "
+"ÐÐÐÐÑÑÐÑÐ, ÐÐÐÐÐÐÐÑ Ñ ÐÐÐÐÐÐÑÑÐÐÐ (KB). ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ 4096 (4MB). ÐÐÐ "
+"ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÐÑÑÑ "
+"âforce_message_limitâ (ÐÑÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÑÐÐ)."
 
 #: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
@@ -12303,9 +12140,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:191
 msgid ""
@@ -12327,14 +12165,14 @@ msgid ""
 "beyond which a '...' is shown."
 msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐ Ñ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÑÑÐÐ, "
-"ÐÐÑÐÐ ÑÐÐÐ ÑÐ â...â ÐÑÐÐÐÐÐÐÐ."
+"ÐÐÑÐÐ ÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ â...â."
 
 #: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
-"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ "
+"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ "
 "ÑÐÑÐÑÐÐÐ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:195
@@ -12343,12 +12181,12 @@ msgid ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑ ÐÐÑÑÑÐ "
-"ÑÐÐÐÐÐ ÐÐÐÐ, ÑÐÐÑÑÐ ÐÐ ÐÐÑÑÐÑ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
+"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑ ÐÐÑÑÑÐ "
+"ÑÐÐÐÐ ÐÐÑÐ, ÑÐÐÑÑÐ ÐÐ ÐÐÑÑÐÑ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
@@ -12356,7 +12194,7 @@ msgstr "ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
-msgstr "ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐ."
+msgstr "ÐÑÐÐÐ ÐÐ ÐÐÑÐ ÑÐ ÐÐÑÑÐÐ ÐÐÑ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
@@ -12368,19 +12206,19 @@ msgstr "ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÐ 
 
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÑÐÐÑ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
+msgstr "ÐÐÑÐÑÑÐÑÐ ÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ (spamc/spamd)."
+msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ (spamc/spamd)."
 
 #: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐÐÐÐÑ ÑÐÐÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
-msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÑÑÐ."
+msgstr "ÐÐÑÐÑÑÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
@@ -12388,7 +12226,7 @@ msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ (ÐÐÐ DNS-Ð)."
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ (ÐÐÐ ÐÐÐ-Ð)."
 
 #: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
@@ -12396,7 +12234,7 @@ msgid ""
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
-"ÐÐÑÐÑÐÐÑÐÐÐ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ ÑÑÐÐÐÐÐ ÐÑÑÑÐÑ ÐÐ ÐÑÐÐ ÐÐÐÐ ÑÐ "
+"ÐÐÑÐÑÐÐÑÐ ÑÐ ÑÐÐÐÐÐÐÐÐÐÐÐ Ñ ÑÑÐÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÑÑÑÐÑ ÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐ ÑÐ "
 "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ. ÐÐÐ ÑÑÐÑÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÑÑ ÐÐÐ ÐÐ ÐÐÐ "
 "ÐÐÑÑÐÐ."
 
@@ -12406,9 +12244,9 @@ msgid ""
 "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:209
 msgid "Variable width font"
@@ -12440,6 +12278,9 @@ msgid ""
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
+"ÐÐ ÐÐ ÑÐ ÑÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÑÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ. ÐÐÑÑÐÑÐ "
+"ÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐ ÑÐÐÑÐÑÐ "
+"âÐÑÐÑÐÐÐÐâ Ð ÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÑÑ ÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÑÐÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
@@ -12451,30 +12292,28 @@ msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
-msgstr "ÐÐÐÐÐÑÐ Elm ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../modules/mail/e-mail-shell-view.c:1011
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "ÐÐÑÑÐ"
 
 #: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ Elm ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
-msgstr "ÐÐÐÐÐ ÐÐÑÑÐ ÐÐ ÐÑÐÐÑÐÐÐ Elm."
+msgstr "ÐÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÐÐÐ."
 
 #: ../mail/importers/evolution-mbox-importer.c:116
 #: ../plugins/dbx-import/dbx-importer.c:226
-#, fuzzy
-#| msgid "Destination folder:"
 msgid "_Destination folder:"
-msgstr "ÐÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "_ÐÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/dbx-import/dbx-importer.c:232
@@ -12487,28 +12326,22 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ"
 msgid "Select folder to import into"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÐ"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
-#, fuzzy
-#| msgid "Subject"
+#: ../mail/importers/evolution-mbox-importer.c:382
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ÐÐÑÐÐÐ"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
-#, fuzzy
-#| msgid "From"
+#: ../mail/importers/evolution-mbox-importer.c:387
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ÐÐÑÐ"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../mail/importers/evolution-mbox-importer.c:431
 #: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ÐÐÑÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 
@@ -12521,32 +12354,31 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 #: ../plugins/dbx-import/dbx-importer.c:554
 #: ../plugins/pst-import/pst-importer.c:452
 #: ../plugins/pst-import/pst-importer.c:558
-#, fuzzy, c-format
-#| msgid "Importing `%s'"
+#, c-format
 msgid "Importing '%s'"
-msgstr "ÐÐÐÐÐÑÐ â%sâ"
+msgstr "ÐÐÐÐÐÐ â%sâ"
 
 #: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
-msgstr "ÐÑÐÑÑÐÐÐ %s"
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ â%sâ"
 
 #: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
-msgstr "ÐÐÐÐÐÑÐ Pine ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Address Book"
 msgstr "ÐÐÑÐÑÐÑ"
 
 #: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ Pine ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
-msgstr "ÐÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÑÐÐÑÐÐÐ Pine."
+msgstr "ÐÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÑÐÐÑÐÐÐ ÐÐÐÐ."
 
 #: ../mail/mail-autofilter.c:70
 #, c-format
@@ -12572,28 +12404,35 @@ msgstr "%s ÐÐÐÐÑÐÐ ÐÐÑÑÐ"
 msgid "Add Filter Rule"
 msgstr "ÐÐÐÐÑ ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed folder. For more than one filter
-#. rule is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-autofilter.c:450
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:451
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%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] ""
 
 #. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
 msgid "(Not Recommended)"
-msgstr ""
+msgstr "(ÐÐ ÐÑÐÐÐÑÑÑÑÑÐ ÑÐ)"
 
 #: ../mail/mail-config.ui.h:3
 msgid "(Note: Requires restart of the application)"
@@ -12613,15 +12452,15 @@ msgstr "_ÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ Ð
 
 #: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "_ÐÐÐÐÑÐ ÑÐÑÑÑÑ ÐÐ ÑÐÐÐ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
+msgstr "_ÐÐÐÐÑÐ ÑÐÑÑÑÑ ÑÐÐÐ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÐÐÐÑÑ (cc):"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (cc):"
 
 #: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑ (Bcc):"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (Bcc):"
 
 #: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
@@ -12629,7 +12468,7 @@ msgstr "ÐÐÐÐ _ÐÐÑÑÑ ÐÑÑÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑÐÐ ÐÑÐ 
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "ÐÐ_ÐÐ ÑÐÑÑÑÑ Ð ÐÐÐÐ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐ_ÐÐ Ð ÐÐÐÐ ÑÐÑÑÑÑ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
@@ -12637,16 +12476,16 @@ msgstr "ÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÑÐÐÑÑ"
 
 #: ../mail/mail-config.ui.h:14
 msgid "Apply the same _view settings to all folders"
-msgstr ""
+msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ _ÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../modules/addressbook/addressbook-config.c:1020
 msgid "Authentication"
-msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
-msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐ _ÐÐÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐ _ÑÐÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
@@ -12658,7 +12497,7 @@ msgstr "_ÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÑÐÑÐÑÐ Ñ _ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÑÐÑÐÑÐ Ñ _ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
@@ -12717,14 +12556,10 @@ 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 "ÐÑÐÐÐÐÐÐÐ _ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/mail-config.ui.h:40
-#, fuzzy
-#| msgid "Do not format messages when text si_ze exceeds"
 msgid "Do not display messages when text si_ze exceeds"
 msgstr "ÐÐ ÑÐÑÐÐÑÐÑÐÑ ÐÐÑÑÐÐ ÐÐÐÐ ÐÐÐÐÑÐ_ÐÐ ÐÑÐÑÐ"
 
@@ -12738,19 +12573,19 @@ msgstr "ÐÐ ÑÐÑÐÑÐÑ"
 
 #: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
-msgstr "_ÐÐÑÑÐÐÐÐ ÐÐÑÑÑÐ:"
+msgstr "_ÐÐÑÑÐÐÐÐ ÐÐÑÑÑÐ:"
 
 #: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
-msgstr "ÐÐÐÐÑÑÐÐÑÐÐ _ÐÐÑÐÑÐ:"
+msgstr "ÐÐÑÐÑÐ _Ð-ÐÐÑÑÐ:"
 
 #: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
-msgstr "ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ _ÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑ"
+msgstr "ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ _ÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÑ"
 
 #: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑ ÑÐÐÐÐÐ_ÐÐÑÑ"
+msgstr "ÐÐÑÑÑÐ ÐÐÐÐÑÐÑ ÑÐÐÐÐÐ_ÐÐÑÑ"
 
 #: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
@@ -12758,7 +12593,7 @@ msgstr "ÐÐÑÑÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑ_ÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ ÑÐ_ÑÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÑÐ_ÑÑÐÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
@@ -12778,7 +12613,7 @@ msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
-msgstr "ÐÐÐÐÐÑÑ ÐÐÑÑÐÐ Ñ H_TML"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÑÑÐÐ Ñ ÐÐÐ_Ð"
 
 #: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
@@ -12786,15 +12621,15 @@ msgstr "ÐÐÐ Ð ÐÑÐÐÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:57
 msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑ ÐÑÑÐÐ ÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ, ÐÐÐ ÑÐ ÐÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
-msgstr "HTML ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
-msgstr "H_TTP ÐÐÑÑÐÐÐÐÐ:"
+msgstr "ÐÐÐÐ _ÐÐÑÑÐÐÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:60
 msgid "Headers"
@@ -12806,7 +12641,7 @@ msgstr "ÐÐÐÐÐÑÐ _ÑÐÑÐÑÐ ÑÐ"
 
 #: ../mail/mail-config.ui.h:63
 msgid "Ignore Reply-To: for mailing lists"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÐ âÐÐÐÐÐÐÑ-ÐÐ:â ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:64
 msgid "Inline"
@@ -12814,7 +12649,7 @@ msgstr "ÐÐÑÑÐÑ"
 
 #: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
-msgstr "ÐÐÑÑÐÑ (Outlook ÑÑÐÐ)"
+msgstr "ÐÐÑÑÐÑ (ÐÑÑÐÑÐ ÑÑÐÐ)"
 
 #: ../mail/mail-config.ui.h:67
 msgid "KB"
@@ -12860,13 +12695,14 @@ msgstr "ÐÐÐ _ÐÐÑÑÐÐÐÐÐÐ ÐÐ:"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "ÐÐÐÐÐÐÐÐ: ÐÐÑÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑ ÐÐÐ ÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐ ÐÑÑ"
+msgstr ""
+"ÐÐÐÐÐÐÐÐ: ÐÐÑÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑ ÑÐÐ ÐÐÐ ÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐ ÐÑÑ"
 
 #: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÑÑÐ ÑÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ "
-"ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÑÐÐ."
+"ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÑÑÐ ÑÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐÐ "
+"ÑÑÐÑÐÑÐ."
 
 #: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
@@ -12879,7 +12715,7 @@ msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG ÐÐ _ÐÑÑÑÐ:"
+msgstr "ÐÐÐ/ÐÐÐ ÐÐ _ÐÑÑÑÐ:"
 
 #: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
@@ -12891,7 +12727,7 @@ msgstr "ÐÐÑÑ:"
 
 #: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÐ Bcc ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ _ÑÐÑÐÑ ÐÐÑÑÐÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÐ ÐÑÑ ÐÑÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -12903,19 +12739,15 @@ msgstr "ÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑ"
 
 #: ../mail/mail-config.ui.h:91
 msgid "Prompt when mailing list redirects private reply back to list"
-msgstr ""
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÑÐÑÑÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÑÑÑ"
 
 #: ../mail/mail-config.ui.h:92
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐ ÐÐÐÐÑÐÐ _ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:93
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when sending replies to _many recipients"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÐ Bcc ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÑÐ _ÐÑÐÐÐÐÐÐÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
@@ -12943,23 +12775,23 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:101
 msgid "SHA1"
-msgstr ""
+msgstr "ÐÐÐ1"
 
 #: ../mail/mail-config.ui.h:102
 msgid "SHA256"
-msgstr ""
+msgstr "ÐÐÐ256"
 
 #: ../mail/mail-config.ui.h:103
 msgid "SHA384"
-msgstr ""
+msgstr "ÐÐÐ384"
 
 #: ../mail/mail-config.ui.h:104
 msgid "SHA512"
-msgstr ""
+msgstr "ÐÐÐ512"
 
 #: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL ÐÐÑÐ ÐÐÐÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
@@ -12979,7 +12811,7 @@ msgstr "_ÐÑÐÐÐÐÑÐÐÐ ÑÐÐÑ:"
 
 #: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
-msgstr "ÐÐÐÑÑÐÐ MIME (S/MIME)"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐ (Ð/ÐÐÐÐ)"
 
 #: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
@@ -12987,35 +12819,31 @@ msgstr "ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
-msgstr "ÐÐÐÐÐÑÐÑÐ HTML ÑÐÐÑ ÑÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÑ ÑÑÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
-msgstr "ÐÐÐÐÐÑÐÑÐ HTML ÑÐÐÑ ÑÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÑ ÑÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑ"
 
 #: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
-msgstr "ÐÐÐÐÐÑÐÑÐ HTML ÑÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
-msgstr "ÐÐÐÐÐÑÐÑÐ HTML ÑÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑ"
 
 #: ../mail/mail-config.ui.h:118
-#, fuzzy
-#| msgid "Select Folder"
 msgid "Select Junk Folder"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:120
-#, fuzzy
-#| msgid "Select Drafts Folder"
 msgid "Select Trash Folder"
-msgstr "ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
@@ -13035,7 +12863,7 @@ msgstr "ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ Ð ÐÐÑÑÑÐ"
 
 #: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
-msgstr "ÐÐÑ_ÐÐÑ ÑÑÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ"
+msgstr "ÐÐÑ_ÐÐÑ ÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
@@ -13043,13 +12871,11 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
-msgstr "_ÐÐÐ ÑÐÑÐÐÑÐ: "
+msgstr "_ÐÐÐ ÑÐÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:128
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÐÑÐÑÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
@@ -13057,7 +12883,7 @@ msgstr "ÐÐÑ_ÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÑÐÑÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
@@ -13068,10 +12894,8 @@ msgid "Signatures"
 msgstr "ÐÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:133
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÐÑÐÑÐÐ Ð_ÐÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
@@ -13079,7 +12903,7 @@ msgstr "ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
-msgstr "Ð ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐ _ÐÑÑÐÑÐ ÐÐ ÐÐÑ"
+msgstr "Ð ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐ _ÐÑÑÐÑÐ ÐÑÐ ÐÐÑ"
 
 #: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
@@ -13099,15 +12923,13 @@ msgid ""
 "for display purposes only. "
 msgstr ""
 "ÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ ÐÐÐ\n"
-"ÐÐÑÐÐÑ. ÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ\n"
+"ÐÐÑÐÐÑ. ÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ\n"
 "ÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑ. "
 
 #. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
 #: ../mail/mail-config.ui.h:143
-#, fuzzy
-#| msgid "Posting destination"
 msgid "Top Posting Option"
-msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐ ÐÑÑ"
 
 #: ../mail/mail-config.ui.h:144
 msgid ""
@@ -13123,7 +12945,7 @@ msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
-msgstr "ÐÐÑÐÑÑÐ ÐÑÑÐ_ÐÑÐÑÐÐÐÑÐÑÑ"
+msgstr "ÐÐÑÐÑÑÐ _ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
 #: ../plugins/google-account-setup/google-contacts-source.c:286
@@ -13142,11 +12964,11 @@ msgstr "_ÐÐÐÐÑ ÐÐÑÐÐÑ"
 
 #: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
-msgstr "_ÐÐÐÐ ÑÑÐÑÐÐÐÑ ÑÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "_ÐÐÐÐ ÑÑÐÑÐÑ ÑÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
-msgstr "ÐÐÐ _ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐ ÐÐ_ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
@@ -13158,7 +12980,7 @@ msgstr "_ÐÐÑÐÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐÐ"
 
 #: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "ÐÐ ÐÐÑÐÐÑÑÑ ÐÐÑÑÐÐÐ ÐÐ Ñ_ÐÑÑÐÐÐÐ (Outlook ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ)"
+msgstr "ÐÐ ÐÐÑÐÐÑÑÑ ÐÐÑÑÐÐÐ ÐÐ Ñ_ÐÑÑÐÐÐÐ (ÐÑÑÐÑÐ ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ)"
 
 #: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
@@ -13166,10 +12988,8 @@ msgstr "ÐÑÐÐ _ÐÑÐÑÐÐÑÐÐÐÑÐ:"
 
 # bug: requires a comment on usage
 #: ../mail/mail-config.ui.h:157
-#, fuzzy
-#| msgid "Current Folder"
 msgid "_Junk Folder:"
-msgstr "ÑÐÐÑÑÐÑ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐ _ÑÑÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
@@ -13181,7 +13001,7 @@ msgstr "_ÐÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
-msgstr "_ÐÑÐÑÐÑ ÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ Ñ ÐÐÑÑÐÑ"
+msgstr "_ÐÑÐÑÐÑ ÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ Ñ ÐÐÑÑÐÑ"
 
 #: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
@@ -13209,11 +13029,11 @@ msgstr "_ÐÑÑÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "_ÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÑÑ HTML ÐÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ ÐÑ ÐÐ ÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ ÐÑ ÐÐ ÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
@@ -13225,7 +13045,7 @@ msgstr "_ÐÐÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
-msgstr "_ÐÐÐÐÐÐÐÐ HTTP ÐÐÑÑÐÐÐÐÐ:"
+msgstr "_ÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
@@ -13247,10 +13067,8 @@ msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ To / Cc / Bcc Ñ "
 
 #: ../mail/mail-config.ui.h:180
-#, fuzzy
-#| msgid "Drafts _Folder:"
 msgid "_Trash Folder:"
-msgstr "_ÐÐÑÑÐÐÐÐ ÐÐÑÑÑÐ:"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐ _ÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
@@ -13264,7 +13082,7 @@ msgstr "_ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐ"
 msgid "_Use the same fonts as other applications"
 msgstr "_ÐÐÑÐÑÑÐ ÐÑÑÐ ÑÐÐÑÐÐÐ ÐÐÐ ÐÑÑÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
@@ -13273,7 +13091,7 @@ msgstr "a"
 msgid "addresses"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "Ð"
 
@@ -13291,7 +13109,7 @@ 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"
@@ -13307,10 +13125,8 @@ msgid "Co_mpleted"
 msgstr "ÐÐ_ÐÑÑÐÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:6
-#, fuzzy
-#| msgid "collapse"
 msgid "Collapse _all"
-msgstr "ÑÐÑÐÑÐ"
+msgstr "_ÐÐÑÐÐ ÑÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
@@ -13321,14 +13137,12 @@ msgid "Do Not Forward"
 msgstr "ÐÐ ÐÑÐÑÐÐÑÑÑ"
 
 #: ../mail/mail-dialogs.ui.h:9
-#, fuzzy
-#| msgid "E_xpand All Threads"
 msgid "E_xpand all"
-msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÑÐ_ÑÐÑÐÐÐ"
+msgstr "_ÐÐÐÐÑÐÐÐÑ ÑÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
-msgstr "ÐÐÑÑÐÑÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ"
 
 #: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
@@ -13340,7 +13154,7 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
-msgstr "ÐÐ ÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑÑ"
+msgstr "ÐÐ ÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑÑ"
 
 #: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
@@ -13368,7 +13182,7 @@ msgstr "Ð_ÐÑÐÐÑ:"
 
 #: ../mail/mail-dialogs.ui.h:23
 msgid "S_how only items containing:"
-msgstr ""
+msgstr "ÐÑÐÐÐÐÐ ÑÐ_ÐÐ ÑÑÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ:"
 
 #: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
@@ -13376,7 +13190,7 @@ msgstr "ÐÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
-msgstr "ÐÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÑÐ"
 
 #: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
@@ -13388,7 +13202,7 @@ msgid ""
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÑÐ ÑÑ ÐÐÐÐ ÐÐÐÐÑÑÐÐÐ.\n"
-"ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ âÐÐÐÐÐÐâ."
+"ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ âÐÐÐÐÐÐâ."
 
 #: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
@@ -13406,10 +13220,10 @@ msgstr "_ÐÐÐÐÐÐ:"
 msgid "_Tick this to accept the license agreement"
 msgstr "ÐÐ_ÐÐÑÐÑÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ ÑÐÐÐÐÑ Ð ÐÐÑÐÐÑÐ"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:782
 #, c-format
 msgid "Pinging %s"
-msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐÑÑÑÐÐÐÑÑ ÐÐ %s"
+msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐÑÑÑÐÐÐÑÑ ÐÐ â%sâ"
 
 #: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
@@ -13419,279 +13233,267 @@ msgstr "ÐÐÐÑÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ"
 msgid "Fetching Mail"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:596
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑ ÑÐÐÑÐÑÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑÐÑÐ: %s"
 
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, fuzzy, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
+#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:640
+#, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
-"ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ Ñ %s: %s\n"
-"ÐÐÐÑÑÐÐÐÑÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ."
+"ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ Ñ %s: %s\n"
+"ÐÑÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ."
 
-#: ../mail/mail-ops.c:654
-#, fuzzy, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:659
+#, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ: %s"
 
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:779 ../mail/mail-ops.c:871
 msgid "Sending message"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:787
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ %d ÐÐ %d"
+msgstr "ÐÐÑÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ %d ÐÐ %d ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐÐ"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "ÐÑÐÐÐÐÐÐ."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "ÐÐÐÑÑÐÐÐ."
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:943
 #, c-format
 msgid "Saving message to folder '%s'"
-msgstr "ÐÑÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
+msgstr "ÐÑÐÐÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Moving messages to '%s'"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Copying messages to '%s'"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1132
 #, c-format
 msgid "Scanning folders in '%s'"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1281
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1347
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
+msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1419
 #, c-format
 msgid "Opening store '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÑÐÐ ÐÑÑÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Removing folder '%s'"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1614
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "ÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1677
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐ Ð ÑÐÐÑÑÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Storing account '%s'"
-msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1732
 #, c-format
 msgid "Refreshing folder '%s'"
-msgstr "ÐÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1772
 #, c-format
 msgid "Expunging folder '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐÑÐ Ñ â%sâ"
+msgstr "ÐÐÐÐÑÑÑÐÐ ÑÐÐÑÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1818
 msgid "Local Folders"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2021
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[1] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[2] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
+msgstr[0] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÑ"
+msgstr[1] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÐ"
+msgstr[2] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÐ"
 msgstr[3] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
-msgstr[0] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[1] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[2] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
+msgstr[0] "ÐÑÐÐÐ %d ÐÐÑÑÐÑ"
+msgstr[1] "ÐÑÐÐÐ %d ÐÐÑÑÐÐ"
+msgstr[2] "ÐÑÐÐÐ %d ÐÐÑÑÐÐ"
 msgstr[3] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2197
 #, c-format
-#| msgid ""
-#| "Error saving messages to: %s:\n"
-#| " %s"
 msgid "Error saving messages to: %s:\n"
-msgstr ""
-"ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÑÑ ÐÐÑÑÐÐ Ñ: %s:\n"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÑÑ ÐÐÑÑÐÐ Ñ: %s:\n"
 
-#: ../mail/mail-ops.c:2265
+#: ../mail/mail-ops.c:2270
 msgid "Saving attachment"
-msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2290 ../mail/mail-ops.c:2300
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ: %s:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2310
-#| msgid "Could not write data: %s"
+#: ../mail/mail-ops.c:2315
 msgid "Could not write data: "
-msgstr "ÐÐÑÐ ÐÐÐÑÑ ÑÐÐÑ ÐÐÐÐÑÐÐÐ: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ: "
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Disconnecting from '%s'"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑ ÑÐ â%sâ"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Reconnecting to '%s'"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ"
+msgstr "ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ ÐÐ â%sâ"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2555
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐÐÐÐ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2641
 msgid "Checking Service"
-msgstr "ÐÑÐÐÐÑÐ ÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
-msgstr "ÐÑÐÐÐÐÐÐÑÐ..."
+msgstr "ÐÑÐÐÐÑÑÐÐ..."
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
 msgstr "ÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
 msgstr "ÐÑÐÐÐÐ _ÑÐÐ"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
-msgstr "ÐÐÑÑÐÑÐÑÐ..."
+msgstr "ÐÐÑÑÐÑÐÐ..."
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
-msgstr "ÐÐÐÐÑÐ..."
+msgstr "ÐÐÐÐÐ..."
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:228
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:230
 msgid "Enter Passphrase"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:233
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:235
 msgid "Enter Password"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:283
 #, c-format
 msgid "User canceled operation."
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÑÐÑÑ."
 
-#: ../mail/mail-session.c:724
+#: ../mail/mail-session.c:728
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
-msgstr "ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐ, ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐ."
+msgstr "ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ, ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐ."
 
-#: ../mail/mail-session.c:733
+#: ../mail/mail-session.c:737
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ, ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐ."
 
 #: ../mail/mail-tools.c:128
-#, 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:161
-#, 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:273
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ - %s"
+msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ â %s"
 
 #: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../mail/mail-tools.c:318
-#, fuzzy, c-format
-#| msgid "Invalid folder: `%s'"
+#, c-format
 msgid "Invalid folder: '%s'"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: â%sâ"
 
 #: ../mail/mail-vfolder.c:85
 #, c-format
@@ -13708,58 +13510,60 @@ msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ â%s: %sâ"
 msgid "Updating Search Folders for '%s'"
 msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ â%sâ"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the removed folder. For more than one search
-#. folder is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:674
+#. 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:675
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%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] ""
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "ÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1290
 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 ""
@@ -13770,21 +13574,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 ""
@@ -13818,11 +13622,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
@@ -13837,7 +13642,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?"
@@ -13849,93 +13654,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 ""
@@ -13947,27 +13750,21 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ."
 
 #: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ â{0}â?"
 
 #: ../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 "_ÐÐ ÑÑÐÐÐÑÑÑ"
 
@@ -13981,11 +13778,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."
@@ -13997,7 +13794,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",
@@ -14020,37 +13817,33 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/mail.error.xml.h:62
-#, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ Ð ÑÐÐÑÐÐÑ ÐÐÐÑÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐ "
-"ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+"ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ Ð ÑÐÐÑÐÐÑ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ "
+"ÐÐÑÐÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐ."
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐ."
 
 #: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÑÐÐ ÐÐÑÑÐÐÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÑÐÐ ÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐÐÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
-"ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ ÐÐÐÐÐÐ Ð ÑÐÐ ÐÑÐÐÐÐÐÑÑÑÐ\n"
-"ÐÐÐÐÑÐ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+"ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑ Ð ÑÐÐ\n"
+"ÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:68
 msgid ""
@@ -14066,7 +13859,7 @@ msgstr "ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
@@ -14083,13 +13876,14 @@ msgid ""
 "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:74
 msgid "Missing folder."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐÑÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
@@ -14097,7 +13891,7 @@ msgstr "ÐÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
-msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ."
+msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÐ."
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
@@ -14105,15 +13899,15 @@ msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÑÑ
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
 "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:81
 msgid ""
@@ -14121,7 +13915,7 @@ msgid ""
 "HTML email:\n"
 "{0}"
 msgstr ""
-"ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÐÐ Ð ÐÐÐÑ ÐÐ ÐÑÐÐÐ HTML ÐÐÑÑÑ:\n"
+"ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÐÐ Ð ÐÐ ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐ ÐÐÐÐ ÐÐÑÑÑ:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:83
@@ -14138,25 +13932,24 @@ msgstr "ÐÑÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÑÑ ÑÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑ
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "ÐÐÐÑÐ ÑÐÐÑÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐÑÐ ÑÐÐÑÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
 #: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
-msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐ."
+msgstr "ÐÑÐÑÐÑÐÑÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐ."
 
 #: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â Ð ÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â{0}â Ð ÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
-msgstr "ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â{0}â?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
-#| msgid "_Private"
 msgid "Reply _Privately"
-msgstr "Ð_ÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ _ÐÑÐÐÐÑÐÐ"
 
 #: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
@@ -14164,14 +13957,12 @@ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÑÐÐ ÐÐÑÑÐÑ
 
 #: ../mail/mail.error.xml.h:94
 msgid "Send private reply?"
-msgstr ""
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ?"
 
 # bug(slobo): ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ
 #: ../mail/mail.error.xml.h:95
-#, fuzzy
-#| msgid "Sender or Recipients"
 msgid "Send reply to all recipients?"
-msgstr "ÐÐÑÐÑÐÐÐÑ ÐÐÐ ÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
@@ -14188,8 +13979,8 @@ msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐ ÑÐ ÐÐ ÐÐÐÑ "
-"ÐÑÐÐÐÐÐÐÐÐÑÐ, ÐÑÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÑÐ."
+"ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÑÑ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐ Ð ÐÐ ÐÐÐÑ "
+"ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐÐÐ, ÐÑÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:99
 msgid ""
@@ -14202,16 +13993,16 @@ msgid ""
 msgstr ""
 "ÐÐÐÑÐÐÐÑ ÐÐÑÑÐ ÐÐÑÐÑ ÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐ.\n"
 "\n"
-"ÐÐÐÐÐ ÑÐÑÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ-ÐÑÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÐÐ "
-"BCC ÐÑÐÐÐÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÐÐÑÐ, ÐÐÐÐÑÑÐÑÐ ÑÐÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ. "
-"ÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ, ÐÐÐÐÑÑÐ ÐÐÑÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐ: ÐÐÐ CC: ÐÑÐÐÐÐÑÐ."
+"ÐÐÐÐÐ ÑÐÑÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐÑÑ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐÐ-ÐÐâ ÐÐÑÐ ÐÐÐ ÑÐÐÐ "
+"ÐÐÐ ÐÑÐÐÐÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÐÐÑÐ, ÐÐÐÐÑÑÐÑÐ ÑÐÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ. "
+"ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐ, ÐÐÐÐÑÑÐ ÐÐÑÐÐ ÑÐÐÐÐÐ âÐÑÐÐÐ:â ÐÐÐ âCC:â ÐÑÐÐÐÐÑÐ."
 
 #: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐÑÐ:\n"
+"ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:104
@@ -14219,7 +14010,7 @@ msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"ÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÑÐ:\n"
+"ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:106
@@ -14265,29 +14056,24 @@ msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ Ð ÐÐÐÑÐÑÑÐÐÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:114
-#, fuzzy
-#| msgid ""
-#| "This will mark all messages as read in the selected folder and its "
-#| "subfolders."
 msgid "This will mark all messages as read in the selected folder."
-msgstr ""
-"ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ Ð ÐÐÐÑÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ GroupWise ÑÐÑÐÐÑ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ."
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐÑÐÑÑÐÑÐ ÑÐÑÑÐÐÑÐÑ "
-"ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ?"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐ ÐÐÑÐÑÑÐÐ ÑÐÑÑÐÐÑÐÑ "
+"ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ ÑÐÐÑÑÐ ÑÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ."
 
 #: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
@@ -14295,7 +14081,7 @@ msgstr "ÐÐÑÐÑÑÐ _ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
 #: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
-msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ?"
+msgstr "ÐÐ ÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ?"
 
 #: ../mail/mail.error.xml.h:120
 msgid ""
@@ -14313,6 +14099,9 @@ msgid ""
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr ""
+"ÐÐÐÐÐÐÑÐÐÐ ÑÑÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÑ ÐÐÑÐ ÑÐ ÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ, ÐÐÐ ÐÐÑÑÐ "
+"ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÑÑÑ. ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ "
+"ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ?"
 
 #: ../mail/mail.error.xml.h:123
 msgid ""
@@ -14320,18 +14109,17 @@ msgid ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
+"ÐÐÐÐÐÐÑÐÐÐ ÑÑÐ ÐÐ ÐÐÑÑÐÑ ÐÐÑÐ ÑÐ ÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ, ÐÐÐ ÑÑÐ ÐÑÐÐÐÑÐÐ "
+"ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÑ; Ð ÐÐ ÐÐ ÐÐÑÑÑ. ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ "
+"ÐÐÑÑÐÐÐÑÐ?"
 
 #: ../mail/mail.error.xml.h:124
-#, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this?"
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ ÑÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐ ÐÐ "
-"ÑÑÐÐÐÑÐ? "
+"ÐÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÑÐÑ ÐÐÑÐ ÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐÐÑÐ. ÐÐ ÐÐ ÑÑÐ "
+"ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÑÐ?"
 
 #: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
@@ -14343,19 +14131,19 @@ msgstr "ÐÐÑÑÐ ÑÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐ."
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐÑÐ ÐÐÑÑÐÐ, ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ?"
+msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐÑÐ ÐÐÑÑÐÐ, ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ?"
 
 #: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ."
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ ÑÐ ÐÑÑÐÐ ÐÐÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ."
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐ ÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ."
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ."
 
 #: ../mail/mail.error.xml.h:131
 msgid ""
@@ -14363,9 +14151,9 @@ msgid ""
 "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:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -14373,7 +14161,7 @@ msgstr "ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑ â{0}â ÐÐÐ â{0}â ÐÐÑÐ Ñ
 
 #: ../mail/mail.error.xml.h:134
 msgid "_Append"
-msgstr "_ÐÐÐÐÑ"
+msgstr "_ÐÑÐÐÐÑÐ"
 
 #: ../mail/mail.error.xml.h:135
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
@@ -14383,10 +14171,10 @@ msgstr "_ÐÐÐÐÐÐÑÑÐ"
 
 #: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
-msgstr "_ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
 #: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "ÐÑÐÑÐÐÐÐ _ÐÐÐÑÐ"
 
@@ -14400,16 +14188,12 @@ msgstr "_ÐÑÐÐÑÐ ÐÐÑÑÐÐ"
 
 # bug(slobo): ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ
 #: ../mail/mail.error.xml.h:142
-#, fuzzy
-#| msgid "Send Receipt"
 msgid "_Send Receipt"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÑÐÑÐÐÑÑ"
+msgstr "ÐÐÑÐÑÐ _ÐÐÐÑÐÑÐÐÑÑ"
 
 #: ../mail/mail.error.xml.h:143
-#, fuzzy
-#| msgid "Synchronize"
 msgid "_Synchronize"
-msgstr "ÐÑÐÐÐÐÐ"
+msgstr "_ÐÑÐÐÐÐÐ"
 
 #: ../mail/message-list.c:1170
 msgid "Unseen"
@@ -14459,11 +14243,11 @@ msgstr "?"
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
-msgstr "ÐÐÐÐÑ %l:%M %p"
+msgstr "ÐÐÐÐÑ Ñ %l:%M %p"
 
 #: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
-msgstr "ÐÑÑÐ %l:%M %p"
+msgstr "ÐÑÑÐ Ñ %l:%M %p"
 
 #: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
@@ -14482,19 +14266,19 @@ msgid "Select all visible messages"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/message-list.c:4633
+#: ../mail/message-list.c:4643
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
-"ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÐÐÐÑÐ ÐÑÐÑÑÐÑÐ ÐÑÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐ "
-"ÐÑÐÑÑÐÐÐ->ÐÑÐÑÑÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ."
+"ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÐÐÐÑÐ ÐÑÐÑÑÐÑÐ ÐÑÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐ "
+"âÐÑÐÑÑÐÐÐ->ÐÑÐÑÑÐâ ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ."
 
-#: ../mail/message-list.c:4635
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ."
 
@@ -14512,7 +14296,7 @@ msgstr "ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÑÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÑÐ"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -14523,36 +14307,36 @@ msgid "Sent Messages"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 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:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "ÐÐÐÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "ÐÐÑÑÐÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1239
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "ÐÐÑÐÑÐÐÐÑ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐÐ"
 
@@ -14565,16 +14349,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:208
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 msgstr ""
-"ÐÐÐÐÐÑ ÐÐÐ ÐÐÐÑÑÐÐÑÑÐ ÐÐÐÑÐ ÐÐ ÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐ LDAP ÑÐÑÐÐÑ ÑÐÐÐ "
-"ÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ TLS ÑÐÑÑÐÐÐÑÐ."
+"ÐÐÐÐÐÑ ÐÐÐ ÐÐÐÑÑÐÐÑÑÐ ÐÐÐÑÐ ÐÐ ÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÑÐÐÐ "
+"ÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐ."
 
 #: ../modules/addressbook/addressbook-config.c:210
 msgid ""
@@ -14582,40 +14366,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:602
-#, fuzzy
-#| msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:609
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ÐÐÑÐÑÑÐ Ñ ÐÐÐÐÐÐÐÑÑ _ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:645
 msgid "Copy _book content locally for offline operation"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÐÑ _ÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:753
 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:820
+#: ../modules/addressbook/addressbook-config.c:827
 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:895
+#: ../modules/addressbook/addressbook-config.c:902
 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 "
@@ -14624,32 +14407,32 @@ msgid ""
 msgstr ""
 "ÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐ ÐÑÐÐÐÑ ÐÐÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐÐÐ "
 "ÐÐÑÐÐÑÐÑÐÑÑÐÐ. ÐÐÐÐ ÐÑÐÑÑÐÐÐ âÐÐÐâ ÑÐ ÑÐÑÑÑÐÑÐ ÑÐÐ ÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÐ ÐÐ "
-"ÐÑÐÑÑÐÐÑ. ÐÐÐÐ ÐÑÐÑÑÐÐÐ âÑÐÐÐÐâ ÑÐ ÑÐÑÑÑÐÑÐ ÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐ ÐÐÑÐ "
+"ÐÑÐÑÑÐÐÑ. ÐÐÐÐ ÐÑÐÑÑÐÐÐ âÑÐÐÐÐâ ÑÐ ÑÐÑÑÑÐÑÐ ÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐ ÐÐÑÐ "
 "ÐÐÐÐ."
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Server Information"
 msgstr "ÐÐÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1023
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1024
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "ÐÑÐÑÑÐÐÐÐÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1026
 msgid "Downloading"
 msgstr "ÐÑÐÑÐÐÐÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "Address Book Properties"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1234
 msgid "New Address Book"
 msgstr "ÐÐÐÐ ÐÐÑÐÑÐÑ"
 
@@ -14659,39 +14442,39 @@ 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 "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÐ ÑÑÐÑÐÐÐÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid ""
@@ -14700,21 +14483,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:12
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"ÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑ ÑÐÑÑÐÑÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÑÐ ÐÐ "
+"ÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑ ÑÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÑÐÑÐ ÐÐ "
 "ÑÐÐÐÐÐÐÑÐÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÑ ÐÐÑÐÑÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÑÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "URI for the folder last used in the select names dialog."
@@ -14725,16 +14508,16 @@ msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
-"ÐÐ ÐÐ ÐÐ Ñ ÑÐÐÑÑ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ ÑÐ ÐÐÐÐÐÐ ÑÐÐÐÐÐÐÑÑÐÐÐÐ "
-"ÐÐÐÑÐÐÑÐ."
+"ÐÐ ÐÐ ÑÐ Ñ ÑÐÐÑÑ ÐÐ ÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ ÑÐ ÐÐÐÐÐÐ "
+"ÑÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÑÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
-msgstr "ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:162
-#: ../modules/mail/em-mailer-prefs.c:1165
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "_Table column:"
 msgstr "ÐÐÐÐÐÐ _ÑÐÐÐÐÐ:"
 
@@ -14747,275 +14530,275 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "ÐÐÐÐ _ÐÑÐÐÐÐÑÑ ÐÐÑÐÑÑ ÑÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:97
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
-msgstr "ÐÐ LDAP ÑÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "_ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
-msgstr "ÐÐÐÑÐÐÑ ÐÐ_ÑÑÐ"
+msgstr "ÐÐ_ÑÑÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÑ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑ"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-migrate.c:58
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:312
+#: ../modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
-msgstr "ÐÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ"
 
 #. Translators: This is a save dialog title
 #: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐ ÐÐÐÑÑÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "ÐÐÐÐÐÐ _ÑÐÐ ÐÐÐÑÐÐÑÐ Ñ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "Ð_ÐÑÐÑÐ ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "ÐÑÐÐÐÑÑÐ _ÑÐÐ ÐÐÐÑÐÐÑÐ Ñ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "_ÐÐÐÐ ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÐ_ÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "_ÐÑÐÐÐÐÐÑÑ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÑÐÑÐÑ ÐÐÐ ÐÐÐÑÑÑ"
+msgstr "_ÐÐÑÑÐÐÑ ÐÐÑÐÑÐÑ ÐÐÐ ÐÐÐÑÑÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "ÐÑÐÐÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "_ÐÐÐÐÐÐ ÐÐÐÑÐÐÑ Ñ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "_ÐÐÐÐÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "_ÐÑÐÐÐÑÐ Ñ ÐÐÐÑÐÐÑÑ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑ"
+msgstr "ÐÑÐÑÑÐÐÐÑÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÑÐÐÑ ÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÑÐÐÑ ÐÑÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "_ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑ Ñ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "ÐÐÐÐ ÐÐÐ_ÑÐÐÑ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
-msgstr "ÐÐÐÐ ÐÐÐÑÐÐÑ _ÑÐÐÑÐÐ..."
+msgstr "ÐÐÐÐ _ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "_ÐÑÐÐÑÐ ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÐÑÑÐ ÐÐÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÑÐÐÑÑ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
-msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 #: ../modules/calendar/e-cal-shell-view-actions.c:1496
 #: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_ÐÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "_ÐÑÐÐÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
 #: ../modules/calendar/e-cal-shell-view-actions.c:1513
 #: ../modules/calendar/e-memo-shell-view-actions.c:670
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_ÐÐÑÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÑÑÑ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "ÐÑÐ_ÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "_ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "_Vertical View"
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 #: ../modules/calendar/e-cal-shell-view-actions.c:1656
 #: ../modules/calendar/e-memo-shell-view-actions.c:744
 #: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 #: ../modules/calendar/e-cal-shell-view-actions.c:1670
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:459
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "ÐÐÐÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "ÐÑÐÐÐÐÑ ÑÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐ ÑÑÐÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐ ÐÐÐÑÑÑ"
 
@@ -15039,25 +14822,25 @@ msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÑÑÑ"
 msgid "_Send Message to Contact"
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÑÐÐÑÑ"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÑÑÐ"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "ÐÐÐÑÑÐ ÐÐ %s"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, 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
@@ -15089,15 +14872,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 ""
@@ -15146,7 +14929,7 @@ msgstr "ÐÐÐÐ Ð_ÑÐÑÑÐÐÐ:"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
-msgstr "_ÐÐÐ:"
+msgstr "_ÐÑÐÐÐÐÑÐÐ ÑÐÐ:"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
@@ -15161,29 +14944,29 @@ msgstr "ÐÐÑÑÐ"
 msgid "I_mport"
 msgstr "Ð_ÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "Ð_ÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "Ð_ÐÐÐÐ Ñ ÐÐÐÐÑÐÐ"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-cal-shell-migrate.c:182
 #: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-memo-shell-migrate.c:139
 #: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-task-shell-migrate.c:148
 msgid "On The Web"
 msgstr "ÐÐ ÐÐÐÑ"
 
@@ -15193,56 +14976,56 @@ msgid "Weather"
 msgstr "ÐÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-migrate.c:61
 msgid "Birthdays & Anniversaries"
 msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:408
 #: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:403
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ_ÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:410
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Ð_ÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:412
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ÐÐÐÐ_ÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:432
 #: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../modules/calendar/e-cal-shell-backend.c:729
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "Calendar and Tasks"
 msgstr "ÐÐÐÐÐÐÐÑ Ð ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:169
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15251,25 +15034,23 @@ msgstr ""
 "ÐÑÐÑÐÐ ÐÐ %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:237
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:664
-#, fuzzy
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
 msgid "_New Calendar..."
-msgstr "ÐÐÐÐ _ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐÐ _ÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:681
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, c-format
 msgid "Opening calendar at %s"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ %s"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ ÐÐ %s"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
@@ -15311,7 +15092,7 @@ msgstr "ÐÐÐÐÑÐÑ"
 #: ../modules/calendar/e-memo-shell-view-actions.c:504
 #: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐ iCalendar"
+msgstr "ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1284
 #: ../modules/calendar/e-memo-shell-view-actions.c:585
@@ -15324,7 +15105,7 @@ msgstr "ÐÐ_ÑÐÑÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
@@ -15344,7 +15125,7 @@ msgstr "ÐÐÐÐÐÑÐ _ÐÐÑÑÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
@@ -15357,7 +15138,7 @@ msgstr "ÐÐÐÐ_ÑÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
-msgstr "ÐÐÐÐÑÐ ÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÑÐÑÑÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1347
 #: ../modules/calendar/e-memo-shell-view-actions.c:613
@@ -15367,11 +15148,11 @@ msgstr "Ð_ÑÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
@@ -15391,7 +15172,7 @@ msgstr "_ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
@@ -15399,7 +15180,7 @@ msgstr "ÐÐÑÐÑÐ ÐÐÑ _ÐÐÑÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
-msgstr "ÐÐÑÐÑÐ ÐÐÑ ÐÐÑÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÐÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
@@ -15407,7 +15188,7 @@ msgstr "ÐÐÑÐÑÐ ÑÐÐ ÐÐ_ÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
-msgstr "ÐÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
@@ -15415,7 +15196,7 @@ msgstr "ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ _ÐÐÐÐÑÐÑ..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
-msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1410
 #: ../modules/calendar/e-cal-shell-view-memopad.c:244
@@ -15431,7 +15212,7 @@ msgstr "ÐÐÐÐ _ÑÐÑÑÐÐÐÐ..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
-msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
@@ -15451,7 +15232,7 @@ msgstr "_ÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
-msgstr "ÐÑÐÐÐÐÐÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
@@ -15460,7 +15241,7 @@ msgstr "Ð_ÐÐÐÐÐÑÐ"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1466
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐ iCalendar..."
+msgstr "ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÐÑ..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
@@ -15468,7 +15249,7 @@ msgstr "_ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
-msgstr "ÐÑÐÑÐÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
@@ -15476,7 +15257,7 @@ msgstr "ÐÑÐ_ÑÐÐÑÐ Ñ ÐÐÐÐÐÐÐÐ..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
-msgstr "ÐÑÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Quit"
@@ -15563,10 +15344,10 @@ msgid "New _Memo"
 msgstr "ÐÐÐÐ _ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-backend.c:281
 #: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
-msgstr "ÐÐÐÐÑÐ ÑÐÐÐÑ ÐÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑ ÐÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:258
 #: ../modules/calendar/e-memo-shell-view-actions.c:641
@@ -15576,7 +15357,7 @@ msgstr "_ÐÑÐÐÑÐ ÐÐÐÐÑÐÑ"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:260
 #: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
-msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
@@ -15588,7 +15369,7 @@ msgstr "ÐÑÐÐÑÐ _ÐÐÐ ÑÑÑÐÐÐÑÑ"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:284
 #: ../modules/calendar/e-memo-shell-view-actions.c:808
 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.
@@ -15612,7 +15393,7 @@ msgstr "_ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÑÑÐÐÐ"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
 #: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
@@ -15621,7 +15402,7 @@ msgstr "_ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
 #: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
 #: ../modules/calendar/e-task-shell-view-actions.c:772
@@ -15629,10 +15410,10 @@ msgid "New _Task"
 msgstr "ÐÐÐÐ ÐÐÐ_ÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-backend.c:280
 #: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
 #: ../modules/calendar/e-task-shell-view-actions.c:779
@@ -15642,7 +15423,7 @@ msgstr "_ÐÑÐÐÑÐ ÐÐÐÐÑÐÐ"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
 #: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
-msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:823
@@ -15653,45 +15434,45 @@ msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÐÑ..."
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
 #: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:277
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ÐÐÐÐÑÐ_Ð"
 
-#: ../modules/calendar/e-memo-shell-backend.c:284
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_ÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgid "Create a new shared memo"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ÐÐÐ_ÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:298
 #: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:231
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
-msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:603
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:908
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, c-format
 msgid "Opening memos at %s"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐ %s ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑ ÑÐ â%sâ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -15708,7 +15489,7 @@ msgstr "Ð_ÑÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐ..."
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑÐ"
+msgstr "ÐÑÐÑÑÐÐÐÑÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
@@ -15716,7 +15497,7 @@ msgstr "ÐÐ_ÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
@@ -15724,11 +15505,11 @@ msgstr "_ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
@@ -15740,23 +15521,23 @@ msgstr "_ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÑÐÐÐÑ"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:416
 #, c-format
@@ -15771,7 +15552,7 @@ msgstr[3] "%d ÐÐÐÐÑÐÐ"
 #: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d selected"
-msgstr "%d ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑ â %d"
 
 #: ../modules/calendar/e-memo-shell-view.c:223
 msgid "Delete Memos"
@@ -15781,43 +15562,43 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 msgid "Delete Memo"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-task-shell-backend.c:275
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "_ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:282
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ÐÐÐÐÑÐÐ_Ð ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:292
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ÐÐÐÑÐÐ ÐÐ_ÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-backend.c:297
 #: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:231
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
-msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:603
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:908
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ Ñ %s"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
@@ -15834,7 +15615,7 @@ msgstr ""
 "ÐÐÐ ÐÐÐÑÐÑÐÑÐ ÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÑÑÐÐÐ. ÐÐÐ "
 "ÐÐÑÑÐÐÐÑÐ, ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ.\n"
 "\n"
-"ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ?"
+"ÐÐ ÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐÐÑÐÐ?"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
@@ -15858,7 +15639,7 @@ msgstr "Ð_ÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
@@ -15866,11 +15647,11 @@ msgstr "ÐÐ_ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
@@ -15882,7 +15663,7 @@ msgstr "Ð_ÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
@@ -15890,15 +15671,15 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐ_ÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
@@ -15922,11 +15703,11 @@ msgstr "ÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐ ÑÑÐÐÐÑ"
 
 #: ../modules/calendar/e-task-shell-view-private.c:463
 msgid "Expunging"
@@ -15941,19 +15722,19 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÐ"
 msgstr[2] "%d ÐÐÐÐÑÐÐÐ"
 msgstr[3] "%d ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:333
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
-msgstr "%d ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ â %d"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -15967,158 +15748,159 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÐÐÑÑÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:478
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:486
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÑÐÐÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:930
 msgid "_Disable Account"
 msgstr "_ÐÐÐÐÐÐÑÑÐ ÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:822
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
-msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÐÑ ÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Permanently remove all the deleted messages from all folders"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:834
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "ÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Download Messages for Offline Usage"
-msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "_ÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:843
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr ""
+"ÐÑÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:848
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
-msgstr "ÐÑ_ÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐ"
+msgstr "ÐÑ_ÐÑÐÐÐÐ âÐÐ ÑÐÐÑÐâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "_ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ Ñ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Copy the selected folder into another folder"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "ÐÐÐÐ_ÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:871
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "ÐÐÐÐÑÐ ÑÐÐ ÐÐ_ÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Mark all messages in the folder as read"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "_ÐÑÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ Ñ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:885
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Move the selected folder into another folder"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "_ÐÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Create a new folder for storing mail"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
-msgstr "ÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Change the name of this folder"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "Select all messages in the same thread as the selected message"
-msgstr "ÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐ ÐÑÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÑÑÐÐ ÐÑÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
-msgstr "ÐÐÑÐ Ð_ÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÑÐ Ð_ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "Select all replies to the currently selected message"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "_ÐÐÑÐÐÐ ÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
-msgstr "ÐÐÑÐÐÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "ÐÐÐÐÑÐ _ÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "_ÐÐÐÐ ÐÐÐÐÐÐ"
 
@@ -16127,157 +15909,154 @@ 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:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "Ð_ÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
-msgstr "ÐÑÐÐÐÐ ÑÑÐÐÑÑÐÑ ÐÐÐÑÐÑÐÑÑ ÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÐÑÐÑÐÑÑ ÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "ÐÐÑÐÐ ÑÐÐ _ÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
-msgstr "ÐÐÑÐÐ ÑÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÑÐ_ÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Expand all message threads"
-msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÑÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
-msgstr "Ð_ÐÐÑÐÑÐ ÐÐ ÐÐÑÑÐÐ"
+msgstr "Ð_ÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 msgid "Create or edit rules for filtering new mail"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐ ÑÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "ÐÐÑ_ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Create or edit search folder definitions"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐ ÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÑÑÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "_ÐÑÐÑÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "ÐÑÐÑÐÐÐ ÑÐ ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "ÐÐÑ_ÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "_ÐÐÐÐ ÑÐÑÑÐÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Show Message _Preview"
 msgstr "ÐÑÐÐÐ_ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
-#| msgid "Show deleted messages"
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Show _Deleted Messages"
 msgstr "ÐÑÐÐÐÐÐ Ð_ÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
-#, fuzzy
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "Show deleted messages with a line through them"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐÐÐ) Ñ ÐÐÑÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐÐÐ)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
-msgstr "ÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐÐÐÐÐ"
+msgstr "ÐÑÑÐÐÑÐ ÐÐ _ÑÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "Show message preview below the message list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "Show message preview alongside the message list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "ÐÐÑÑÐÐ Ñ ÐÐÐÑÐÑ 5 ÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "ÐÐÑÑÐÐ ÐÐÑÑ ÑÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "ÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "ÐÐÐÑÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Subject or Addresses contain"
 msgstr "ÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "ÑÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "ÑÐÐÑÑÐÐ ÐÐÐÐÐÑ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "ÑÐÐÑÑÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:936
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -16286,7 +16065,7 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÐ,"
 msgstr[2] "%d ÐÐÐÐÑÐÐÐÑ,"
 msgstr[3] "%d ÐÐÐÐÑÐÐÐ,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:947
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -16295,17 +16074,17 @@ msgstr[1] "%d ÐÐÑÐÑÐÐÐ"
 msgstr[2] "%d ÐÐÑÐÑÐÐÐÑ"
 msgstr[3] "%d ÐÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
-#: ../modules/mail/e-mail-shell-view-private.c:960
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d ÑÑÐÑÐ"
-msgstr[1] "%d ÑÑÐÑÐÑÐ"
-msgstr[2] "%d ÑÑÐÑÐÑÐ"
+msgstr[0] "%d ÐÐÐÐÐÐÑÐÐ"
+msgstr[1] "%d ÐÐÐÐÐÐÑÐÐ"
+msgstr[2] "%d ÐÐÐÐÐÐÑÐÐÑ"
 msgstr[3] "%d ÑÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -16314,7 +16093,7 @@ msgstr[1] "%d ÐÐÑÑÑÐ"
 msgstr[2] "%d ÐÐÑÑÑÐ"
 msgstr[3] "%d ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16323,7 +16102,7 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÑÐ"
 msgstr[2] "%d ÐÐÐÐÑÐÐÑÐÑ"
 msgstr[3] "%d ÐÐÐÐÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16332,7 +16111,7 @@ msgstr[1] "%d ÐÐÑÐÐÑÐ"
 msgstr[2] "%d ÐÐÑÐÐÑÐÑ"
 msgstr[3] "%d ÐÐÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16341,7 +16120,7 @@ msgstr[1] "%d ÐÐÐÑÐÑÐÑÐÐÐ,"
 msgstr[2] "%d ÐÐÐÑÐÑÐÑÐÐÐÑ,"
 msgstr[3] "%d ÐÐÐÑÐÑÐÑÐÐÐ,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16350,188 +16129,183 @@ msgstr[1] "%d ÑÐÑÐÐÐ"
 msgstr[2] "%d ÑÐÑÐÐÐ"
 msgstr[3] "%d ÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view.c:675
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "ÐÑÐÑÑÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view.c:868
+#: ../modules/mail/e-mail-shell-view.c:928
 msgid "Proxy _Logout"
 msgstr "_ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../modules/mail/em-account-prefs.c:130
+#: ../modules/mail/em-account-prefs.c:133
 msgid "Evolution Account Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/mail/em-account-prefs.c:179
+#: ../modules/mail/em-account-prefs.c:182
 msgid "Account Editor"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÐÐÐ"
 
 # has "activatable" set.
-#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/mail/em-composer-prefs.c:505
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "ÐÐÐÐÐ(ÑÐ)"
 
 # bug: requires a comment on usage
 # ÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÑÐ Ð ÐÐÐÐÑÐ
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ÑÐÐÐÐ ÐÑÑ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "ÑÐÐÐÐÐ ÐÐÐÐÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "ÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ÑÐÐÐÐÐ ÐÐÑÐÑÐÐ"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:201
 msgid "Add Custom Junk Header"
 msgstr "ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:209
 msgid "Header Name:"
 msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ:"
 
-#: ../modules/mail/em-mailer-prefs.c:234
+#: ../modules/mail/em-mailer-prefs.c:210
 msgid "Header Value Contains:"
 msgstr "ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ:"
 
-#: ../modules/mail/em-mailer-prefs.c:334
+#: ../modules/mail/em-mailer-prefs.c:310
 msgid "Header"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../modules/mail/em-mailer-prefs.c:338
+#: ../modules/mail/em-mailer-prefs.c:314
 msgid "Contains Value"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÑÑ"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
 #, c-format
 msgid "%s plugin is available and the binary is installed."
-msgstr "ÐÐÑÑÑÐÐÐ ÑÐ %s ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÑÐÐ."
+msgstr "ÐÐÑÑÑÐÐÐ ÑÐ â%sâ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÑÐÐ."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
-msgstr "ÐÐÐÐÑÐÐ %s ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐÐÑÐÐ."
+msgstr "ÐÐÐÐÑÐÐ â%sâ ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐÐÑÐÐ."
 
-#: ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:751
 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:1167
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Date header:"
 msgstr "ÐÐÐÐÐÐÑÐ _ÐÐÑÑÐÐ:"
 
-#: ../modules/mail/em-mailer-prefs.c:1168
+#: ../modules/mail/em-mailer-prefs.c:1144
 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:138
-#, fuzzy
-#| msgid "Do you want to make Evolution your default e-mail client?"
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ ÑÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐ Ð-ÐÐÑÑÐ?"
+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"
+msgstr "ÐÐÑÐÐÐÐ ÐÑÐÐÑÑÑÐÐ ÑÐÑÑÐÑÐÑÐ"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
-msgstr "ÐÐÐÑÐÑÐÑ ÑÐÑÑ ÐÑÐÐÑÑÑÐÐ ÐÐ Python EPlugin."
+msgstr "ÐÑÐÐÑÑÑÐÐ ÑÐÑÑÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑ Ð-ÐÑÐÐÑÑÑÐÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:270
-#: ../widgets/misc/e-import-assistant.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../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:302
-#: ../widgets/misc/e-import-assistant.c:549
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "ÐÐ %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
-#: ../modules/startup-wizard/evolution-startup-wizard.c:410
-#, fuzzy
-#| msgid "Importing files"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
 msgid "Importing Files"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
 msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr ""
+msgstr "ÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ. ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÑÐÐÐÑÐ."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
 msgid "Import complete. Click \"Forward\" to continue."
-msgstr ""
+msgstr "ÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ. ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÑÐÐÐÑÐ."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
 msgid "Evolution Setup Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
 msgid "Welcome"
-msgstr "ÐÐÐÑÐ ÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 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"
 "ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÑÐÐÐÑÐ. "
 
 #: ../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"
@@ -16546,7 +16320,7 @@ msgstr ""
 "ÑÑÐÐÐÑÐ Ñ ÑÐÐÑ ÐÐÑÑÐÐ"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "ÐÑÑÑÐÐ ÑÐÑÐ"
 
@@ -16572,7 +16346,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."
@@ -16608,9 +16382,9 @@ msgid ""
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑÑÑ, "
-"ÐÐÐÐÐÐÐÑÐ, ÐÐÐÐÑÐÐ, ÐÐÐÐÑÐÐ, ÐÐÐÑÐÐÑÐ. ÐÐÐÐÑÐ ÑÐ  ÐÐÐÑ ÐÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐ "
-"ÐÐÑÑÐÐÐÐ, ÑÐÐÑÐÑÐ ÐÐ ÐÐÑÑÑ, ÐÑÐ."
+"ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑÑÑ, "
+"ÐÐÐÐÐÐÐÑÐ, ÐÐÐÐÑÐÐ, ÐÐÐÐÑÐÐ, ÐÐÐÑÐÐÑÐ. ÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐ "
+"ÐÐÑÑÐÐÐÐ, ÑÐÐÑÐÑÐ ÐÐ ÐÐÑÑÑ, ÐÑÐ."
 
 #: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
@@ -16629,130 +16403,123 @@ msgid "Restore from backup"
 msgstr "ÐÑÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-#, fuzzy
-#| msgid "_Backup Settings..."
 msgid "_Backup Evolution Settings..."
-msgstr "_ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÑ ÐÐÑÑÐÐÐÐ..."
+msgstr "_ÐÐÐÑÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ..."
 
 #: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
-msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ Ñ ÐÑÑÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ Ñ ÐÑÑÐÐÑ"
 
 #: ../plugins/backup-restore/backup-restore.c:368
-#, fuzzy
-#| msgid "R_estore Settings..."
 msgid "R_estore Evolution Settings..."
-msgstr "ÐÐ_ÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐ..."
+msgstr "_ÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ..."
 
 #: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÑÐÐÐ"
+msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÑÐÐÐ"
 
-#: ../plugins/backup-restore/backup.c:63
+#: ../plugins/backup-restore/backup.c:80
 msgid "Backup Evolution directory"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÐÐÑÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:84
 msgid "Check Evolution Backup"
-msgstr "ÐÑÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
-msgstr "ÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐÑÐÐ"
+msgstr "ÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐÑÐÐ"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ (ÐÐÑÑÐ, ÐÐÐÐÐÐÐÑÐ, ÐÐÐÐÑÐ, ÐÐÐÐÑÐÐ)"
 
-#: ../plugins/backup-restore/backup.c:213
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backup complete"
-msgstr "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÑÐÐÐ"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:255
-#, fuzzy
-#| msgid "Backup current Evolution data"
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÑÑÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÑÑÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:410
 msgid "Extracting files from backup"
 msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
-msgstr "ÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:482
 msgid "Removing temporary backup files"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÑ ÑÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
-msgstr "ÐÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
-msgstr "ÐÐÐÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ Ñ ÑÐÑÑÐÐÐÑ %s"
+msgstr "ÐÐÐÑÑÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:684
 #, 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:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Backup"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "ÐÐÐÑÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:748
 msgid "Please wait while Evolution is backing up your data."
-msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "ÐÐÐÑÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
-msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÐÐÑÐÐ ÑÑÐÑÐ."
+msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÐÐÑÐÐ ÑÑÐÑÐ."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:769
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ÐÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐ, Ñ ÐÐÐÐÑÐÐÑÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑ."
 
@@ -16763,7 +16530,7 @@ msgstr "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐ Ð ÐÐÐÑÐÐÐÐ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup 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?"
@@ -16776,17 +16543,13 @@ msgstr ""
 "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-#, fuzzy
-#| msgid "Choose an action:"
 msgid "Close and Backup Evolution"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ:"
+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"
@@ -16798,7 +16561,7 @@ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐ
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
@@ -16809,6 +16572,9 @@ msgid ""
 "To backup your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
+"ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÐÐÑÐÐÐÑÐ, ÐÑÐÐ ÐÐÑÐÑÐ ÐÐ "
+"ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ. ÐÑÐÐÑÐ ÑÐÐÑÑÐÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐ "
+"ÐÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐ."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
@@ -16817,6 +16583,10 @@ msgid ""
 "all your current Evolution data and settings and restore them from your "
 "backup."
 msgstr ""
+"ÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÐÐÑÐ, ÐÑÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ. ÐÑÐÐÑÐ "
+"ÑÐÐÑÑÐÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐ. ÐÐÐ ÑÐ "
+"ÐÐÑÐÑÐÑÐ ÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐÑÐ Ð ÐÑÐÑÐÑÐ ÐÐÐ ÐÐ ÐÐÑÐ "
+"ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ."
 
 #: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16826,7 +16596,7 @@ msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÐ"
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
-msgstr "ÐÑÐÐÐ ÑÐÐÑÐ Ñ _ÐÐÑÐÑÐÑ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐ ÑÐÐÑÐ Ñ _ÐÐÑÐÑÐÑ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐ"
 
 #: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
@@ -16834,18 +16604,16 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÐ
 
 #: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
-msgstr "ÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:745
-#, fuzzy
-#| msgid "Synchronize contact info and images from Pidgin buddy list"
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÑÐÐÑÐÐÐ Ð ÑÐÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐ ÐÑÑÐÐÑÐ Ñ ÐÐÑÐÐÑ"
+msgstr "_ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐ ÐÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÐ"
 
 #: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÐÑ ÐÐ Pidgin ÐÐÑÑÑ ÐÑÐÑÐÑÐÑÐ"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÑ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÐÐ"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:762
@@ -16854,7 +16622,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 ""
@@ -16864,7 +16632,7 @@ msgid ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐ ÑÐÐÐ Ñ ÑÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÑÐÐ.\n"
+"ÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐ ÑÐÐÐ Ñ ÑÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÑÐÐ.\n"
 "\n"
 "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐÐÐÐÐÐ Ð ÐÐÑÐÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÐ "
 "ÐÐÑÑÐÐ. ÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÑÐÐÐ ÐÐÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐÑÐ."
@@ -16872,13 +16640,13 @@ msgstr ""
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
-msgstr "ÐÐÐÐÑÐÐÑÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÑÑÐ."
+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:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐ %s: %s."
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐ â%sâ: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
@@ -16893,7 +16661,7 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐÑÐÐÑÐÑÐ Ð
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "ÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑÐÑÑ ÑÐ ÐÑÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d."
+msgstr "ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÑÐÑÑ ÑÐ ÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
@@ -16908,7 +16676,7 @@ msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
 msgstr ""
-"ÐÑÐÐÐÑÑÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐ UTF-8 ÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÑÐ spam/ham ÐÑÐÐÐÐÑÐ "
+"ÐÑÐÐÐÑÑÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐ-8 ÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÑÐ ÑÐÐÐ/ÑÐÐ ÐÑÐÐÐÐÑÐ "
 "ÑÐÑÐ ÑÑ ÑÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -16921,15 +16689,15 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑÐÑÐ"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filter junk messages using Bogofilter."
-msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÐÐÑÐÑÐ."
+msgstr "ÐÐÐÑÑÐÑÐÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÐÐÑÐÑÐ."
 
 #: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
-msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ. ÐÐÑÐÐÑ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÑÐÐÑ."
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ. ÐÐÑÐÐÑ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÑÐÐÑ."
 
 #: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
-msgstr "ÐÐÑÑ ÐÐÑÐÑÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑ ÐÐÑÐÑÑ."
 
 #: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
@@ -16938,12 +16706,12 @@ msgid ""
 "%d - %s"
 msgstr ""
 "ÐÐÑÐÐÑ ÑÐ ÐÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ.\n"
-"%d - %s"
+"%d â %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:333
 #: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ."
 
 #: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
@@ -16956,17 +16724,17 @@ msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
 #: ../plugins/caldav/caldav-browse-server.c:557
 #: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÑ ÑÐÑÐÐÑÐ."
 
 #: ../plugins/caldav/caldav-browse-server.c:626
 #: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐ..."
+msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ..."
 
 #: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ."
 
 #: ../plugins/caldav/caldav-browse-server.c:794
 #, c-format
@@ -16979,20 +16747,19 @@ msgid "Previous attempt failed with code %d"
 msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÑÑÐÑ ÐÐÑÐ ÑÑÐÐÐ, ÐÐÐ %d"
 
 #: ../plugins/caldav/caldav-browse-server.c:801
-#, 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:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ soup ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑÑ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑ ÐÐÐÐ ÐÐ ÐÐÑÐÑÑ â%sâ"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
-msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ..."
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ..."
 
 #: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
@@ -17005,7 +16772,7 @@ msgstr "ÐÐÐÑÑÐÐ"
 #: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ: %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
@@ -17014,7 +16781,7 @@ msgstr "ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
 #: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
-msgstr "ÐÑÐÐÐ ÐÐ CalDAV ÐÐÐÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:100
@@ -17024,7 +16791,7 @@ msgstr "_ÐÐÑÐÑÐ :"
 #: ../plugins/caldav/caldav-source.c:223
 #: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐÑ ÐÐÐÑ"
+msgstr "ÐÐÑÐÑÑÐ _ÐÐÐ"
 
 #: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
@@ -17041,11 +16808,11 @@ 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:125
 msgid "_Customize options"
@@ -17065,7 +16832,7 @@ msgstr "ÐÑÐ ÐÑÐÐÑÐÑÑ"
 
 #: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
-msgstr "ÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 # Create the default Person calendar
 # Create the default Person task list
@@ -17076,11 +16843,11 @@ msgstr "ÐÐÑÐÐÐÐÑÐÐ"
 
 #: ../plugins/calendar-file/calendar-file.c:213
 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"
@@ -17096,7 +16863,7 @@ 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"
@@ -17168,7 +16935,7 @@ msgstr "ÐÐÐÐÑÐÑÐÐÐÐ (ÐÐÑÐÐÑÐÑÑ, ÐÐÑÐ, ÐÑÐ.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Add weather calendars to Evolution."
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
@@ -17185,41 +16952,31 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÑ ÑÐÐÑ ÐÐÐÑÐÐÐÑÐ"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
-msgstr "ÐÐÐÐÑÐ ÐÐÑÑÑ ÑÐ ÐÐÐÐÑÐÑÐÐ ÐÐÐÑÐÐÑÐ, ÐÐÐÐ ÑÐ ÐÐÐÑÑÐ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÑÑÑ ÑÐ ÐÐÐÐÑÐÑÐÐ ÐÐÐÑÐÐÑÐ, ÐÐÐÐ ÑÐ ÐÐÐÑÑÐ."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
 msgid "Map for contacts"
 msgstr "ÐÐÑÑÐ ÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../plugins/dbx-import/dbx-importer.c:232
-#, fuzzy
-#| msgid "Select folder to import into"
 msgid "Select folder to import OE folder into"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../plugins/dbx-import/dbx-importer.c:251
-#, 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:83
 msgid "Mark as _default address book"
@@ -17227,7 +16984,7 @@ msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ _ÐÐÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
-msgstr "ÐÐÐÐ_ÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐÐ"
+msgstr "ÐÐÐ _ÐÐÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐÐ"
 
 #: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
@@ -17276,13 +17033,13 @@ msgid "Protected"
 msgstr "ÐÐÑÑÐÑÐÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "ÐÐÑÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:325
 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.
@@ -17314,14 +17071,14 @@ msgid "Key"
 msgstr "ÐÑÑÑ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 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"
@@ -17334,12 +17091,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:126
 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"
@@ -17359,7 +17116,7 @@ msgid ""
 "For VI use \"gvim -f\""
 msgstr ""
 "ÐÐ ÐÐÐÐÑ ÐÐÑÐÑÑÐÑÐ âxemacsâ\n"
-"ÐÐ VI ÐÐÑÐÑÑÐÑÐ âgvim -fâ"
+"ÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ âgvim -fâ"
 
 #: ../plugins/external-editor/external-editor.c:382
 #: ../plugins/external-editor/external-editor.c:384
@@ -17376,7 +17133,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"
@@ -17400,7 +17157,7 @@ msgid ""
 "closed as long as the editor is active."
 msgstr ""
 "ÐÐÐÑÐÐÑÑ ÑÐ ÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑ. ÐÑÐÐÐÑ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÑÐ "
-"ÐÐÐ ÑÐ ÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑ."
+"ÐÐÐ ÑÐ ÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑ."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
@@ -17412,7 +17169,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 ""
@@ -17432,7 +17189,7 @@ msgstr "ÐÐÑÐÑÐÐÐ ÑÐÐÐÐ"
 
 #: ../plugins/face/face.c:355
 msgid "_Insert Face picture by default"
-msgstr "_ÐÐÐÑÐÐ ÑÐÐÐÑ ÐÐÐÑÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÐÐÑ ÐÐÐÑÐÐÑÐ"
 
 #: ../plugins/face/face.c:366
 msgid "Load new _Face picture"
@@ -17468,20 +17225,19 @@ 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:274
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
-#, fuzzy
-#| msgid "_Server:"
 msgid "Server"
-msgstr "Ð_ÐÑÐÐÑ:"
+msgstr "ÐÐÑÐÐÑ"
 
 #: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ %s ÑÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ."
+"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ â%sâ ÑÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ."
 
 #: ../plugins/google-account-setup/google-source.c:548
 #, c-format
@@ -17489,12 +17245,12 @@ msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐ ÑÐÑÐÐÑÐ Google.\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÐ ÑÐÑÐÐÑÐ.\n"
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:953
 msgid "Unknown error."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
 
@@ -17503,18 +17259,16 @@ msgid "Cal_endar:"
 msgstr "ÐÐÐ_ÐÐÐÐÑ:"
 
 #: ../plugins/google-account-setup/google-source.c:669
-#, fuzzy
-#| msgid "Retrieve _list"
 msgid "Retrieve _List"
 msgstr "ÐÐÐÑÑÐ _ÐÐÑÑÑ"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 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/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
@@ -17549,7 +17303,7 @@ msgid "Rese_nd Meeting..."
 msgstr "ÐÐÐÐÐÐ _ÑÐÑÐ ÑÐÑÑÐÐÐÐ..."
 
 #: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Create folder"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ"
 
@@ -17567,9 +17321,9 @@ msgid ""
 "Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
-"ÐÐÑÐÑÐÐÐ â%sâ ÑÐ ÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ\n"
+"ÐÐÑÐÑÐÐÐ â%sâ ÑÐ ÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ\n"
 "\n"
-"ÐÐÑÑÐÐ ÐÐ â%sâ\n"
+"ÐÐÑÑÐÑ ÑÐÑÐ â%sâ\n"
 "\n"
 "\n"
 "%s\n"
@@ -17626,7 +17380,7 @@ msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ ÑÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐ ÐÐ "
+"ÐÐÐÐÐÑÐÑÐÐ ÐÐÑÑÐÐ ÐÐÐÐÑÐ ÑÐ ÑÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐ ÐÐ "
 "ÑÑÐÐÐÑÐ? "
 
 #: ../plugins/groupwise-features/mail-retract.c:111
@@ -17639,15 +17393,15 @@ msgstr "ÐÐÐÑÐ ÐÐÑÐÑÐ ÑÐÐÑÐ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
-msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐ ÑÐÐÑÐ GroupWise ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÑÐÐ"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "Fine-tune your GroupWise accounts."
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ GroupWise."
+msgstr "ÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐÐ."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
-msgstr "GroupWise ÐÐÐÑÑÐÐÑÑÐ"
+msgstr "ÐÐÐÑÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐÐ"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
@@ -17659,7 +17413,7 @@ msgstr "ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐ
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐ &quot;{0}&quot; ÐÐÑ ÐÐÑÑÐÑÐ. ÐÑÐÐÐÑÐÑÐ ÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÑÐÐÐÑÐÑÐ ÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
 msgid "Account Already Exists"
@@ -17676,15 +17430,15 @@ msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
 msgstr ""
-"ÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÐ &quot;{0}&quot; ÐÐÑÐ ÐÐÐÐ ÑÑÐÐÑÐÐ. ÐÑÐÐÐÑÐÑÐ "
-"ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ Ð ÐÐÐÑÑÐÑÑÐ ÐÐÐÐÐÐ."
+"ÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÐ â{0}â ÐÐÑÐ ÐÐÐÐ ÑÑÐÐÑÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ "
+"Ð ÐÐÐÑÑÐÑÑÐ ÐÐÐÐÐÐ."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "ÐÐÑÐÑÐÐÐÑ &quot;{0}&quot; ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÑÐ ÐÐÑÑÐÐÐÐÐÑ"
+msgstr "ÐÐÑÐÑÐÐÐÑ â{0}â ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÑÐ ÐÐÑÑÐÐÐÐÐÑ"
 
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
@@ -17704,8 +17458,7 @@ msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
-"ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ ÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐÐ user &quot;{0}&quot;"
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ ÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐÐ â{0}â"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
@@ -17771,10 +17524,8 @@ msgid "The participants will receive the following notification.\n"
 msgstr "ÐÑÐÑÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ.\n"
 
 #: ../plugins/groupwise-features/properties.ui.h:9
-#, fuzzy
-#| msgid "Users"
 msgid "Users:"
-msgstr "ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐÐÑÐ:"
 
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
@@ -17835,7 +17586,7 @@ msgid "Proxy"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:230
 msgid "Account Name"
 msgstr "ÐÐÐ ÐÐÐÐÐÐ"
 
@@ -17855,18 +17606,16 @@ msgstr "%sÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
 #: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
-"ÐÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐ ÐÐ ÐÑÐÐÐ."
+"ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐ ÐÐ ÐÑÐÐÐ."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
-"ÐÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐ ÐÐÐÐÑÑÐÐ."
+"ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐ ÐÐÐÐÑÑÐÐ."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:700
-#, fuzzy
-#| msgid "Proxy"
 msgctxt "GW"
 msgid "Proxy"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ"
@@ -17874,22 +17623,22 @@ msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ"
 #: ../plugins/groupwise-features/proxy.c:926
 #: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
-msgstr "ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐÐÐÐ"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder-common.c:310
 #: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "ÐÐÑÐÑÐÐÑÐ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:311
 msgid "Enter the users and set permissions"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:407
 msgid "Sharing"
 msgstr "ÐÐÑÐÑÐ"
 
@@ -17901,6 +17650,10 @@ msgstr "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑÑÐÑÐ"
 msgid "Add   "
 msgstr "ÐÐÐÐÑ "
 
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "ÐÐÐÐÐÐ"
+
 #: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ÐÑÐÑÑÑ ÐÐÑÑÐÐ"
@@ -17956,7 +17709,7 @@ 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:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
@@ -17966,7 +17719,7 @@ msgstr "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 #: ../plugins/imap-features/imap-headers.c:343
 #: ../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)"
@@ -17987,7 +17740,7 @@ 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
@@ -17995,7 +17748,7 @@ msgid ""
 "_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
@@ -18004,19 +17757,18 @@ 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:485
-#, 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:649
 #, c-format
@@ -18026,184 +17778,186 @@ msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÑÑ â%sâ ÑÐ Ñ 
 #: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ â%sâ"
+msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐ ÐÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÑÑ â%sâ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÑÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÑÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "ÐÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÐÑÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Opening the calendar. Please wait.."
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ. ÐÐÑÐÐÐÑÑÐ..."
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ. ÐÐÑÐÐÐÑÑÐ..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:878
 msgid "Searching for an existing version of this appointment"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÑÐÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1059
 msgid "Unable to parse item"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÑÐÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑ â%sâ.  %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑ â%sâ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÑÐÑÐÐÑÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÑÐ ÑÐÐÐÑÐÑ"
+msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÐÐÑÑÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1172
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "ÐÑÐÐÐÐÐÐÑÐÑ ÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ %s "
+msgstr "ÐÑÐÐÐÐÐÐÑÐÑ ÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ â%sâ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ÐÐÐÐÐÐÑÑ ÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÐÐÐÐÐÑÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÐÐÐÐÐÑÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÑÐÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÑÐÑÐ"
+msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÐÑÐÑÐ ÑÑÐÑÐÐÐÐ. %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐÐ ÑÑÐÑÐÐÐÐ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Attendee status updated"
 msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÑÐ ÐÐÑÑÐÑÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Meeting information sent"
-msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Task information sent"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Memo information sent"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÑ, ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ, ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send task information, the task does not exist"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ, ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ, ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1466
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1536
 msgid "Save Calendar"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÐÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid "The calendar attached is not valid"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "ÐÐÑÑÐÐ ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÐÐÐÑ, ÐÐÐ ÑÐÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ."
+msgstr ""
+"ÐÐÑÑÐÐ ÐÑÐÑÐÐÑÑÑÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ, ÐÐÐ ÑÐÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ "
+"ÐÐÐÐÐÐÐÐÑ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "The item in the calendar is not valid"
 msgstr "ÐÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1778
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
-"ÐÐÑÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ, ÐÐÐ ÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐ, ÐÐÐÐÑÐÐ ÐÐÐ ÑÐÐÐÐÐÐÐ/"
-"ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ."
+"ÐÐÑÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ, ÐÐÐ ÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐ, ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÐÐ "
+"ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "The calendar attached contains multiple items"
 msgstr "ÐÐÐÐÐÐÐÑ Ñ ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1683
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 "ÐÐÐÐ ÐÐÑÐÐÐ ÑÐÐÑ ÐÐÐÑ ÑÑÐÐÐÐ, ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÑÐ Ð ÐÐÐÐÐÐÐÑ ÑÐÐÑÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2456
 msgid "This meeting recurs"
-msgstr "ÐÐÐÑ ÑÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2455
+#: ../plugins/itip-formatter/itip-formatter.c:2459
 msgid "This task recurs"
-msgstr "ÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2458
+#: ../plugins/itip-formatter/itip-formatter.c:2462
 msgid "This memo recurs"
-msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "_Delete message after acting"
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÐ ÑÐÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2702
-#: ../plugins/itip-formatter/itip-formatter.c:2735
+#: ../plugins/itip-formatter/itip-formatter.c:2706
+#: ../plugins/itip-formatter/itip-formatter.c:2739
 msgid "Conflict Search"
-msgstr "ÐÐÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2721
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐÑÐ Ñ ÑÐÑÑÐÐÑÐÐÐ"
 
@@ -18211,44 +17965,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
@@ -18352,279 +18106,222 @@ msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 #: ../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:"
@@ -18653,7 +18350,7 @@ msgstr "ÐÑÐÐÐ ÐÐÐÑÑÐÑÐÐ:"
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
-msgstr "_ÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
+msgstr "Ð_ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../plugins/itip-formatter/itip-view.c:849
 #: ../plugins/itip-formatter/itip-view.c:853
@@ -18668,10 +18365,8 @@ msgstr "_ÐÐÐÐÑ"
 #: ../plugins/itip-formatter/itip-view.c:862
 #: ../plugins/itip-formatter/itip-view.c:878
 #: ../plugins/itip-formatter/itip-view.c:883
-#, fuzzy
-#| msgid "Accept"
 msgid "A_ccept"
-msgstr "ÐÑÐÑÐÐÑÐ"
+msgstr "_ÐÑÐÑÐÐÑÐ"
 
 #: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
@@ -18689,8 +18384,6 @@ msgid "_Tentative"
 msgstr "ÐÐ _ÑÐÐÐÑÐÐÐ"
 
 #: ../plugins/itip-formatter/itip-view.c:855
-#, fuzzy
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "Ð_ÑÐÑÐÐÑÐ ÑÐÐ"
 
@@ -18749,21 +18442,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"
@@ -18776,94 +18463,86 @@ 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 "Blink icon in notification area."
-msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
-msgstr "ÐÐÑÑÑÑÑÐ ÐÐÑÑÐÐ D-Bus."
+msgstr "ÐÐÑÑÑÑÑÐ Ð-ÐÐÑ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
-msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐÐÑ Ñ ÐÐÐÐÐÑÑÐÑÐÑ ÐÐÐÑ."
+msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐÐÑ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../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 ÐÐÑÑÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐ."
+msgstr "ÐÑÐÐÑÐ Ð-ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr ""
-"ÐÐÐÑÐÐ ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐ âtrueâ (ÑÐÑÐÐ), Ð ÐÐÐÑÐ ÐÑÑÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ "
-"ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
+"ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ, ÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÑÐ ÐÑÑÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ "
+"ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "ÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "ÐÑÑÑÐ ÐÐÑÐ ÑÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ, ÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÑÑÐÐÐ ÐÐÐÐÐÑÑÐÑÐ "
 "ÑÐÑÐÐÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../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:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÑÑ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 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:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐ ÑÐÐÐ"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep 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:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐ ÑÑÐÐÑÐ ÐÐÐ ÐÐ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÑÑÐ Ð ÐÐÐÐÑ ÐÐÑÑÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÑÐ."
 
-#: ../plugins/mail-notification/mail-notification.c:369
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "ÐÐÐÐÑÑÐÑÐÐÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÑÑÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÑÑÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18886,19 +18565,19 @@ msgstr[3] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
-msgstr "ÐÐ: %s"
+msgstr "ÐÐÑÐ: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
 msgstr "ÐÐÑÐÐÐ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:542
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18907,50 +18586,46 @@ msgstr[1] "ÐÑÐÐÐÐÐ ÑÑÐ %d ÐÐÐÐ ÐÐÑÑÐÐ."
 msgstr[2] "ÐÑÐÐÐÐÐ ÑÑÐ %d ÐÐÐÐÑ ÐÐÑÑÐÐ."
 msgstr[3] "ÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÑÑÐÑ."
 
-#: ../plugins/mail-notification/mail-notification.c:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ Ñ _ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑ Ñ _ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:680
-msgid "B_link icon in notification area"
-msgstr "ÐÑÐ_ÐÐÑÐ ÐÐÐÐÐ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ "
-
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "ÐÑÐÐÐÐÐ _ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "_ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
-msgstr "_ÐÐÐÑÐÐ"
+msgstr "_ÐÐÐÐÑÑÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐ _ÑÐÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "ÐÑÑÑÐ _ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ:"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
-msgstr "ÐÐÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "ÐÐÐÐÐÑÑÐ Ð ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÐ ÐÐ _ÐÐÐÐÑÑÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
-msgstr "ÐÑÐÐÑÐ _D-Bus ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÑÐ _Ð-ÐÐÑ ÐÐÑÑÐÑ"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18958,7 +18633,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:158
@@ -18966,7 +18641,7 @@ msgstr "ÐÐÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ.
 msgid "Created from a mail by %s"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐ ÐÐÑÑ ÑÐÑÐ %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18975,7 +18650,7 @@ msgstr ""
 "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÑ â%sâ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÑÐÐÐÑÐ ÑÑÐÑÐ "
 "ÐÐÐÐÑÐÑ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18983,7 +18658,7 @@ msgid ""
 msgstr ""
 "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ â%sâ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÑÐÐÐÑÐ ÑÑÐÑÐ ÐÐÐÐÑÐÐ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18994,7 +18669,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -19005,7 +18680,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -19016,7 +18691,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -19027,7 +18702,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -19050,7 +18725,7 @@ msgstr[3] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -19073,7 +18748,7 @@ msgstr[3] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -19093,139 +18768,139 @@ msgstr[3] ""
 "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÑÑ ÐÐÑÑÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ "
 "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[ÐÐÐ ÑÐÐÐÑÐÐ]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÑÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÑÐÑÐÐ ÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
-msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑ. %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
-"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÑÑ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ. "
+"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ. "
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
-"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÑÑ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ. "
+"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ. "
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 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:952
+#: ../plugins/mail-to-task/mail-to-task.c:953
 #, c-format
 msgid "Cannot get source list. %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐ. %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1072
 msgid "Create an _Event"
 msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÐÑÐÑ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a new event from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a Mem_o"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐ_Ñ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a new memo from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a _Task"
 msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÐÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a new task from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1096
 msgid "Create a _Meeting"
 msgstr "ÐÐÐÑÐÐÐ _ÑÐÑÑÐÐÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 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."
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÑÑÐÑ Ñ ÐÐÐÐÑÐÐ."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "ÐÑÐÐÐÐÐ _ÐÑÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð _ÐÐÑÐÑÑÐÑÑ ÐÐÑÑÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÑÑÐÑÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÑÑÐÑÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÑÑÑ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "ÐÑÐ_ÑÐÐÐ ÑÐ ÐÐ ÐÐÑÑÑ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "ÐÑÐÑÐÐÐ ÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
-msgstr "Ð_ÐÑÐÐÐ ÑÐ ÐÐÑÑÐ"
+msgstr "Ð_ÐÑÐÐÐ ÑÐ ÑÐ ÐÐÑÑÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "ÐÐÑÐÐÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "ÐÐÐÐÑÐÐ _ÐÐÑÑÐ"
 
@@ -19276,7 +18951,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 ""
@@ -19285,7 +18960,7 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"ÐÐÐÑÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÑÐ. ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑ ÑÐÐÑÑ ÐÐÑÐ ÑÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ "
+"ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÑÑÐÐÐ. ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑ ÑÐÐÑÑ ÐÐÑÐ ÑÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ "
 "ÑÐÐÑÑ.\n"
 "\n"
 "ÐÐÐÐÐÐÑÐ: {0}"
@@ -19316,7 +18991,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 ""
@@ -19326,16 +19001,16 @@ msgstr ""
 "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ ÑÐÐÐ Ñ ÑÑÐÐÑÑÐÐÑ ÑÐÑÑÐÐÐÐ, ÐÐÐ Ð "
 "ÐÐÐ Ñ ÐÐÐÑÐÑÑÐÐÐÐÐÐ? "
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "Ð ÑÑÐÐÑÑÐÐÑ ÑÐÑÑÐÐÐÐ Ð _ÐÐÐÑÐÑÑÐÐÐÐÐÐ"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "ÐÐÐÐ Ñ ÑÑÐÐÑÑÐÐÑ _ÑÐÑÑÐÐÐÐ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:439
 msgid "Mark Me_ssages as Read"
 msgstr "ÐÐÐÐÑÐ ÐÐ_ÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
@@ -19392,33 +19067,33 @@ 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:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Show HTML if present"
-msgstr "ÐÑÐÐÐÐÐ HTML ÐÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Let Evolution choose the best part to show."
-msgstr "ÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
+msgstr "ÐÑÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text if present"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐ ÑÐÐÑÑ ÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
-"ÐÑÐÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐ, ÐÐÐ ÐÐÑÑÐÑÐ, ÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐ "
-"ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
+"ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐ, ÐÐÐ ÐÐÑÑÐÑÐ, ÐÐÐÑÐ ÐÑÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ "
+"ÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Only ever show plain text"
 msgstr "ÐÑÐÑÑÑÐÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÑÐÐ ÑÐÐÑÑ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19426,13 +19101,13 @@ msgstr ""
 "ÐÐÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐ, ÐÑÐÐÐÐÑÑÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÑÐÑ, ÐÐ "
 "ÐÐÐÐÑÑ."
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:257
 msgid "Show s_uppressed HTML parts as attachments"
-msgstr "ÐÑÐÐÐÐÐ ÐÐ_ÑÐÑÐÑÑÐ HTML ÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐ_ÑÐÑÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:277
 msgid "HTML _Mode"
-msgstr "HTML _ÑÐÐÐÐ"
+msgstr "ÐÐÐÐ _ÑÐÐÐÐ"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
@@ -19444,15 +19119,15 @@ 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:295
 msgid "_Mail"
@@ -19480,11 +19155,11 @@ msgstr "_ÐÐÐÐÑÐ"
 #. Journal
 #: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
-msgstr "ÐÐÐÑÐ Ñ _ÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐ _ÐÐÐÐÐÐÐÐ"
 
 #: ../plugins/pst-import/pst-importer.c:347
 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
@@ -19498,33 +19173,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:208
 #: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ %s:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ %s:"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ %s ÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ %s ÑÐ ÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ %s:"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐ %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:596
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
@@ -19540,7 +19215,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÑÐÑ
 #. ever happen, and if so, then something is really wrong.
 #: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÐÑÐÐÑ."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
@@ -19556,7 +19231,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)"
@@ -19568,7 +19243,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"
@@ -19580,11 +19255,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:"
@@ -19600,7 +19275,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"
@@ -19632,19 +19307,19 @@ msgstr "_ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "iCal"
-msgstr "iCal"
+msgstr "ÐÐÐÐ"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐÑÑ"
 
@@ -19657,27 +19332,27 @@ msgstr "ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ, ÐÐÐ: %d"
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑ: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
-msgstr "ÐÑÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÑÑ: %s"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ, ÑÐÐÑÐÐ..."
+msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ, ÑÐÐÑÐÐ..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐÐ..."
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÑÐ ÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐÐ..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "ÐÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d"
+msgstr "ÐÐÐÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
@@ -19694,7 +19369,7 @@ msgstr "Ð_ÐÑÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Filter junk messages using SpamAssassin."
-msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐ ÑÐÐÐÐ."
+msgstr "ÐÐÐÑÑÐÑÐÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐ ÑÐÐÐÐ."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin Junk Filter"
@@ -19758,7 +19433,7 @@ msgstr "ÐÐÐÐÑÐÐÐ"
 
 #: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
-msgstr "ÐÐ_ÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑ CSV"
+msgstr "ÐÐ_ÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ"
 
 #: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
@@ -19803,7 +19478,7 @@ msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
-msgstr "RDF ÐÐÐÐÐ (.rdf)"
+msgstr "ÐÐÐ ÐÐÐÐÐ (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
@@ -19831,7 +19506,7 @@ msgstr "ÐÐÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐ ÐÑÐÐÐ ÐÐÑ
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÑÐÐÐ"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
@@ -19854,25 +19529,25 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐ ÐÐÑÐÐÐÑ ÐÐÑÑÑÐ"
 
-#: ../plugins/templates/templates.c:616
+#: ../plugins/templates/templates.c:627
 msgid "No Title"
 msgstr "ÐÐÐ ÐÐÐÑÐ"
 
-#: ../plugins/templates/templates.c:687
+#: ../plugins/templates/templates.c:722
 msgid "Save as _Template"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐ _ÑÐÐÐÐÐ"
 
-#: ../plugins/templates/templates.c:689
+#: ../plugins/templates/templates.c:724
 msgid "Save as Template"
 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"
@@ -19882,43 +19557,43 @@ msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐ"
 msgid "Show vCards directly in mail messages."
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÑÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:164
-#: ../plugins/vcard-inline/vcard-inline.c:249
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑ ÐÐÐÑÑÑ"
 
-#: ../plugins/vcard-inline/vcard-inline.c:167
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑÑ ÐÐÐÑÑÑ"
 
-#: ../plugins/vcard-inline/vcard-inline.c:228
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "ÐÐÑÑÐÑÐ ÑÐÑ ÑÐÐÐÐ ÐÐÐÑÐÐÑ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:237
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, 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:258
+#: ../plugins/vcard-inline/vcard-inline.c:275
 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:68
 msgid "WebDAV"
-msgstr "WebDAV"
+msgstr "ÐÐÐÐÐÐ"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
@@ -19926,7 +19601,7 @@ msgstr "ÐÐÑÐÑÐ :"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 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"
@@ -19942,7 +19617,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"
@@ -19972,7 +19647,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
@@ -19981,19 +19656,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."
@@ -20006,10 +19681,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"
@@ -20021,15 +19696,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"
@@ -20046,27 +19721,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 ""
@@ -20075,21 +19750,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:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:341
 msgid "Start in offline mode"
-msgstr "ÐÐÑÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
@@ -20113,15 +19788,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 ""
@@ -20133,15 +19808,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 ""
@@ -20149,7 +19824,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 ""
@@ -20157,7 +19832,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 ""
@@ -20165,7 +19840,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 ""
@@ -20186,7 +19861,7 @@ msgid ""
 msgstr ""
 "ÐÐÐÑ ÐÑÑÑ ÑÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÑÑ ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐ, ÐÐÐ ÐÐÑÐÑÑÐÑÐ "
 "ÐÐÑÑÐÐÐÐÐÐ (ÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐ). ÐÑÐÐÐÐÑÑÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÐÑÐÐÐ, ÐÐÐÐÐÐ "
-"(ÑÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑ *.foo.com), IP ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ (IPv4 Ð IPv6) Ð "
+"(ÑÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑ *.foo.com), ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ (ÐÐÐ4 Ð ÐÐÐ6) Ð "
 "ÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÑÐÐÐ (ÐÐÑÑÐ ÐÐÐ 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -20199,11 +19874,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."
+msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -20211,30 +19886,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"
@@ -20244,11 +19919,11 @@ msgstr "ÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 msgid "Window buttons are visible"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑ ÐÐÐÑÐÐÐ"
 
-#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-content.c:563
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "ÐÐÑÑÐÐÑ ÐÑÐÑÑÐÐÑ"
 
@@ -20256,19 +19931,19 @@ msgstr "ÐÐÑÑÐÐÑ ÐÑÐÑÑÐÐÑ"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:921
+#: ../shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "ÐÑÐÐÐ_ÐÐ: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:952
+#: ../shell/e-shell-searchbar.c:960
 msgid "Sear_ch:"
 msgstr "Ð_ÑÐÑÑÐÐÐ:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1013
+#: ../shell/e-shell-searchbar.c:1021
 msgid "i_n"
 msgstr " _Ñ "
 
@@ -20322,15 +19997,15 @@ msgstr "_ÐÐÐÑÐÐÑ"
 
 #: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÐÑÑÑÑÐÐ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÑÐÑÑ"
+msgstr "ÐÐÐÐ_Ñ ÐÐ ÐÐÐÐÑÑÐÑÑ"
 
 #: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
-msgstr "ÐÑÐÐÑÐ ÐÐÐ ÑÑÑÐÐÐÑÑ ÑÐ ÑÐÑÑÐ ÐÐÑÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐ ÑÑÑÐÐÐÑÑ ÑÐ ÑÐÑÑÐ ÐÐÑÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
@@ -20338,7 +20013,7 @@ msgstr "ÐÐÐÐÑÐÐÐ _ÐÐÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
@@ -20346,7 +20021,7 @@ msgstr "_ÐÐÐÐÐ..."
 
 #: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
@@ -20354,7 +20029,7 @@ msgstr "ÐÐÐ Ð_ÑÐÐÐÑ"
 
 #: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
-msgstr "ÐÑÐÐÑÐ ÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
@@ -20362,15 +20037,15 @@ msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ"
 
 #: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
-msgstr "_ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ"
+msgstr "_ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÑÑÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÑÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
-msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
@@ -20378,11 +20053,11 @@ msgstr "_ÐÐÐÑÐÐÐÐ ÐÑÐÑÑÐÐÐ..."
 
 #: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
-msgstr "ÐÐÑÐÐÑÑ ÐÐÐÑÐÐÐÐÑÑ ÐÑÐÑÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÐÑÐÐÐÐÑÑ ÐÑÐÑÑÐÐÑ"
 
 #: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
-msgstr "ÐÑÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
@@ -20390,7 +20065,7 @@ msgstr "_ÐÑÐÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ..."
 
 #: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
-msgstr "ÐÐÑÐÐÑÐ ÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐÑÑÐ ÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
@@ -20403,7 +20078,7 @@ msgstr "ÐÑÐ_ÐÐÑÐ ÑÐÐÐ"
 #. Block the default Ctrl+F.
 #: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
-msgstr "ÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÑÐÑÐ ÐÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
@@ -20411,15 +20086,15 @@ msgstr "_ÐÐÑÑÐÐÑ ÐÑÐÑÑÐÐÑ..."
 
 #: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
-msgstr "ÐÐÑÑÐÐÑ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
-msgstr "ÐÐÐÑÐ / Ð_ÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐ / Ð_ÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
-msgstr "ÐÐÑÐ ÐÑÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÑÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
@@ -20427,7 +20102,7 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð _ÐÑÐÑÑÐ..."
 
 #: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð ÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð ÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
@@ -20435,7 +20110,7 @@ msgstr "ÐÐ_Ð ÐÐÐ ÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
@@ -20443,7 +20118,7 @@ msgstr "_ÐÐÐ ÐÐ ÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐ ÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
@@ -20467,11 +20142,11 @@ msgstr "ÐÑÐ_ÐÐÑ"
 
 #: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑ _ÑÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐ _ÐÐÑÐÑ ÐÐÐÑÑ"
 
 #: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑ ÑÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑ ÐÐÐÑÑ"
 
 #: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
@@ -20479,15 +20154,15 @@ msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ _ÑÑÐÑÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ _ÑÑÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÑÑÐÑÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÑÑÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
@@ -20495,15 +20170,15 @@ msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ _ÐÐÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
-msgstr "ÐÐÐÐ _ÐÐÐÐÐ"
+msgstr "ÐÐÐÐ _ÐÐÐÐÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
@@ -20511,15 +20186,15 @@ msgstr "ÐÐÐÐ _ÑÐÐÑÑ"
 
 #: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
-msgstr "ÐÐÐÐÐ _Ð ÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÑÐ _Ð ÑÐÐÑÑ"
 
 #: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐ Ð ÑÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐÐÑÐÐÐ Ð ÑÐÐÑÑÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
@@ -20527,8 +20202,7 @@ msgstr "ÐÑÐÐ ÑÑÐ_ÐÐ ÐÐÐÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÑÑÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÑÑÐÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÑÐ"
 
 #: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
@@ -20536,7 +20210,7 @@ msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ..."
 
 #: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
-msgstr "ÐÑÐÐÐ ÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
@@ -20544,7 +20218,7 @@ msgstr "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ..."
 
 #: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
@@ -20556,11 +20230,11 @@ msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
-msgstr "ÐÑÐÐÑÑÐÐ ÐÑÐÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÑÑÐÐ ÐÑÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
-msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÑÑÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÑÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÑÑÐÐÐÐÑ"
 
 #: ../shell/e-shell-window-actions.c:2183
 #, c-format
@@ -20569,32 +20243,32 @@ msgstr "ÐÑÐÑÐ ÐÐ %s"
 
 #: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
-msgstr "ÐÐÐÑÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
 
 #. Translators: This is used for the main window title.
 #: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
-msgstr "%s - ÐÐÐÐÑÑÐÑÐ"
+msgstr "%s â ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/e-shell-window.c:416
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "ÐÐÐÐ"
 
-#: ../shell/e-shell.c:226
+#: ../shell/e-shell.c:244
 msgid "Preparing to go offline..."
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ..."
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ..."
 
-#: ../shell/e-shell.c:276
+#: ../shell/e-shell.c:294
 msgid "Preparing to go online..."
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐ ÐÑÐÐÐ..."
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐ ÐÐ ÑÐÐ ÐÐ ÐÑÐÐÐ..."
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:353
 msgid "Preparing to quit..."
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÑ..."
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐ ÐÐ ÐÐÐÑÐÐ..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20627,9 +20301,9 @@ msgstr ""
 "ÑÑ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ ÐÐÐ ÐÐÑÑ.\n"
 "\n"
 "ÐÐÐÐÐÐ ÑÐ ÐÐ ÑÐÑÐ ÑÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐ, Ð \n"
-"ÐÐÑÐÐ ÐÑÑÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÑ!\n"
+"ÐÐÑÐÐ ÐÑÑÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÑ!\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20637,63 +20311,63 @@ msgstr ""
 "ÐÐÐÐÐ\n"
 "ÐÐÐ ÐÐÐÐÑÑÐÑÐ\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:221
 msgid "Do not tell me again"
 msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐ ÑÐÑÐ"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:337
 msgid "Start Evolution activating the specified component"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÑ ÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐ"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:339
 msgid "Apply the given geometry to the main window"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÐ ÐÑÐÐÐÑ"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:343
 msgid "Start in online mode"
 msgstr "ÐÐÑÐÐ ÑÐÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:345
 msgid "Start in \"express\" mode"
 msgstr "ÐÐÑÐÐ Ñ âÐÐÑÐÑÐÑÐÐÐâ ÑÐÐÐÐÑ"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:348
 msgid "Forcibly shut down Evolution"
 msgstr "ÐÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÑÑÐÑÑ"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:351
 msgid "Send the debugging output of all components to a file."
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ Ð ÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑ ÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐÑ."
 
-#: ../shell/main.c:343
+#: ../shell/main.c:353
 msgid "Disable loading of any plugins."
-msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÑÐÑÑÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
 
-#: ../shell/main.c:345
+#: ../shell/main.c:355
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ, ÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ, ÐÐÐÑÐÐÑÐ Ð ÐÐÐÐÑÐÐÐ."
 
-#: ../shell/main.c:349
+#: ../shell/main.c:359
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑ ÐÐÐ ÐÑÑÐÑÐÐ ÐÑÐÑÐÐÐÐÑÐ."
 
 # shell:noshell-reason title
-#: ../shell/main.c:351
+#: ../shell/main.c:361
 msgid "Request a running Evolution process to quit"
-msgstr "ÐÐÑÑÐÐÐÑ ÐÑÐÑ ÐÐÐÑÐÐÑÑÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐÐÑÑÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:505 ../shell/main.c:513
 msgid "- The Evolution PIM and Email Client"
-msgstr "- ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÑ Ð-ÐÐÑÑÐ"
+msgstr "â ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÑ Ð-ÐÐÑÑÐ"
 
-#: ../shell/main.c:545
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
-"%s: --online Ð --offline ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
-"  ÐÐÑÐÑÑÐÑÐ %s --help ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.\n"
+"%s: â--onlineâ Ð â--offlineâ ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
+"  ÐÐÑÐÑÑÐÑÐ â%s --helpâ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -20701,16 +20375,12 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ
 
 # shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
-#| msgid "Delete old data from version {0}?"
 msgid "Cannot upgrade directly from version {0}"
-msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐ {0}?"
+msgstr "ÐÐ ÐÐÐÑ ÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐ {0}"
 
 #: ../shell/shell.error.xml.h:3
-#, fuzzy
-#| msgid "Continue"
 msgid "Continue Anyway"
-msgstr "ÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
@@ -20718,6 +20388,9 @@ msgid ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 msgstr ""
+"ÐÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑ ÐÐÐÐÐÑÐÐÑÑ ÑÐ ÐÐÐÐÑÐ {0}. ÐÐÑÑÑÐÐ, ÐÐÐ "
+"ÑÐÑÐÑÐ ÐÐÐÐÑÐ ÐÑÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÑ 2, Ð ÐÐÑÐÐ ÐÐ "
+"ÐÐÐÐÑÑÐÑÑ 3."
 
 #: ../shell/shell.error.xml.h:5
 msgid ""
@@ -20728,14 +20401,12 @@ msgstr ""
 "ÑÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÑ ÐÑÐÑ ÐÐÐÐ ÐÐÑÑÐÐÐÐ."
 
 #: ../shell/shell.error.xml.h:7
-#, fuzzy
-#| msgid "Quit"
 msgid "Quit Now"
 msgstr "ÐÐÐÑÐ"
 
 #: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐÐÑÐ ÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐ:"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐÐÑÐ ÑÐ ÐÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ:"
 
 #: ../shell/shell.error.xml.h:9
 msgid "_Forget"
@@ -20760,7 +20431,7 @@ msgstr "_ÐÑÐÐÐÐ ÑÑÐÐÐÐ"
 
 #: ../shell/test/e-test-shell-backend.c:62
 msgid "Create a new test item"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÑÐÐÐÑ ÑÑÐÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÑÑÐÐÐÑ"
 
 #: ../shell/test/e-test-shell-backend.c:70
 msgctxt "New"
@@ -20769,7 +20440,7 @@ msgstr "ÐÑÐÐÐÐ _ÐÐÐÐÑ"
 
 #: ../shell/test/e-test-shell-backend.c:72
 msgid "Create a new test source"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑ"
 
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
@@ -20784,7 +20455,7 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ desktop 
 #: ../smclient/eggdesktopfile.c:958
 #, c-format
 msgid "Starting %s"
-msgstr "ÐÐÐÑÐÑÐÑÐ %s"
+msgstr "ÐÐÐÑÐÑÐÐ %s"
 
 #: ../smclient/eggdesktopfile.c:1100
 #, c-format
@@ -20799,7 +20470,7 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ: %d"
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐ ÐÐ desktop ÑÐÐÑ âType=Linkâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐ ÐÐ âType=Linkâ ÑÐÐÑ"
 
 #: ../smclient/eggdesktopfile.c:1394
 #, c-format
@@ -20841,7 +20512,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"ÐÐÑÑÐÑÐÐÐÑ â%sâ ÑÐ CA ÑÐÑÑÐÑÐÐÐÑ.\n"
+"ÐÐÐÑÐÑÐ â%sâ ÑÐ CA ÑÐÐÑÐÑÐ.\n"
 "\n"
 "ÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ:"
 
@@ -20851,8 +20522,8 @@ msgid ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
-"ÐÐÑÑÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ, ÐÐÐÐ ÐÐÑÑÑÐÑÐ Ð Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ "
-"ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
+"ÐÐÑÑÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÐÑÐÑÐ, ÐÐÐÐ ÐÐÑÑÑÐÑÐ Ð Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ ÐÐÐÐ "
+"ÑÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
@@ -20860,18 +20531,18 @@ msgid ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
-"ÐÐÑÑÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ, ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐ Ñ "
-"ÐÑÑÐÐÑÐÑÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
+"ÐÐÑÑÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÐÑÐÑÐ, ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐ Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ "
+"ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:148
 #: ../smime/gui/certificate-manager.c:460
 #: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ ÑÐÐÐ..."
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐ..."
 
 #: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
-msgstr "ÐÐÐ PKCS12 ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐ ÐÐÐÐ12 ÐÐÑÐÑÐÐÐ"
 
 #: ../smime/gui/certificate-manager.c:163
 #: ../smime/gui/certificate-manager.c:475
@@ -20880,16 +20551,14 @@ msgid "All files"
 msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../smime/gui/certificate-manager.c:182
-#, fuzzy
-#| msgid "Imported Certificate"
 msgid "Failed to import user's certificate"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐ"
 
 #: ../smime/gui/certificate-manager.c:352
 #: ../smime/gui/certificate-manager.c:574
 #: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
-msgstr "ÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:361
 #: ../smime/gui/certificate-manager.c:592
@@ -20907,41 +20576,38 @@ msgstr "ÐÑÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
-msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐÑÑÐ"
 
 #: ../smime/gui/certificate-manager.c:502
-#, fuzzy
-#| msgid "Failed to delete contact"
 msgid "Failed to import contact's certificate"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
-msgstr "ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ"
 
 #: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
-msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ CA ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:737
 msgid "Failed to import certificate authority's certificate"
-msgstr ""
+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"
@@ -20954,7 +20620,7 @@ msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
-"ÐÐÐÐÑÐ:\n"
+"ÐÐÐÐ ÑÐ ÐÐÐÐÑÐ:\n"
 "  ÐÐÑÐÐÐ: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:117
@@ -20963,58 +20629,56 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
-"ÐÐÐÐÐ:\n"
+"ÐÐÐÐÐ ÑÐ:\n"
 "  ÐÐÑÐÐÐ: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:167
 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:1086
 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)"
@@ -21022,23 +20686,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"
@@ -21054,19 +20718,19 @@ msgstr "ÐÑÐÑÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
-msgstr "ÐÐÐÐÑÐ ÐÐ"
+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:26
 msgid "MD5 Fingerprint"
-msgstr "MD5 ÐÑÐÑÐÐ"
+msgstr "ÐÐ5 ÐÑÐÑÐÐ"
 
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
@@ -21078,37 +20742,35 @@ msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ (OU)"
 
 #: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
-msgstr "SHA1 ÐÑÐÑÐÐ"
+msgstr "ÐÐÐ1 ÐÑÐÑÐÐ"
 
 #: ../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"
@@ -21116,34 +20778,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 "ÐÐÑÐ ÑÐÐÑÐÑÐ"
 
-#: ../smime/gui/smime-ui.ui.h:43
-#, fuzzy
-#| msgid "Backup"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
-msgstr "ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐ _ÑÐÐÐÑÐÑ"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../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"
@@ -21160,65 +20821,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
@@ -21247,7 +20902,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"
@@ -21255,11 +20910,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"
@@ -21283,11 +20938,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"
@@ -21314,11 +20969,11 @@ msgstr "%s = %s"
 
 #: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
-msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
-msgstr "ÐÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑ"
 
 #: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
@@ -21330,19 +20985,19 @@ msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐÑÐ"
 
 #: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
-msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
-msgstr "PKCS12 ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐ12 ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ PKCS12 ÐÐÑÐÑÐÐÑ:"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ12 ÐÐÑÐÑÐÐÑ:"
 
 #: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -21354,7 +21009,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"
@@ -21374,19 +21029,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"
@@ -21394,11 +21049,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"
@@ -21414,7 +21069,7 @@ msgstr "ÐÐ _ÑÐÐÐÐ"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "ÐÐ _ÑÑÐÑÑÑÐÐ"
+msgstr "ÐÐ _ÑÑÐÑÐÐ"
 
 # ÐÐÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐ, ÐÐÐ ÐÐ
 # ÐÐÑÐÐ ÐÐ?
@@ -21425,7 +21080,7 @@ msgstr "ÐÐ _ÑÑÐÑÑÑÐÐ"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
-msgstr "UTC"
+msgstr "ÐÐÐ (UTC)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
@@ -21437,7 +21092,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 ""
@@ -21450,7 +21105,7 @@ msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
 msgid "_Selection"
-msgstr "_ÐÐÐÐÐÑ"
+msgstr "_ÐÐÐÐÑ"
 
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
@@ -21472,7 +21127,7 @@ msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐ â%sâ"
 msgid "Table"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "ÐÐÑÑÐÐÑ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
@@ -21500,40 +21155,40 @@ msgstr "ÐÐÐ ÐÑÐÐÐÐÐÐ"
 msgid "Type of view:"
 msgstr "ÐÐÐ ÐÑÐÐÐÐÐÐ:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
 msgid "De_fault"
 msgstr "ÐÐÐ_ÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "ÐÑÐÑÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
-msgstr "MIME ÑÐÐ:"
+msgstr "ÐÐÐÐ ÑÐÐ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "_ÐÑÐÐÐÐÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÐ _ÐÐÐÐÐÐÐÑ"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐ"
@@ -21541,42 +21196,42 @@ msgstr[1] "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
 msgstr[2] "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
 msgstr[3] "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "_ÐÐÑÐÑÐ ÐÐ..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "ÐÑÐÑÐÐÐÑÐ"
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "ÐÑÐÐÑÐ"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÑ ÐÑÐ_ÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show Attachment _Bar"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÑ Ð_ÑÐÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "ÐÐÐÐÑ ÐÑÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "ÐÑÐ_ÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
@@ -21585,147 +21240,143 @@ msgstr[2] "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐ"
 msgstr[3] "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:346
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "S_ave All"
 msgstr "ÐÐÑ_ÑÐÐÑ ÑÐÐ"
 
-#: ../widgets/misc/e-attachment-view.c:372
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "A_dd Attachment..."
 msgstr "ÐÐ_ÐÐÑ ÐÑÐÐÐÐ..."
 
-#: ../widgets/misc/e-attachment-view.c:396
+#: ../widgets/misc/e-attachment-view.c:401
 msgid "_Hide"
 msgstr "_ÐÐÐÑÐÑ"
 
-#: ../widgets/misc/e-attachment-view.c:403
-#, fuzzy
-#| msgid "S_ave All"
+#: ../widgets/misc/e-attachment-view.c:408
 msgid "Hid_e All"
-msgstr "ÐÐÑ_ÑÐÐÑ ÑÐÐ"
+msgstr "ÐÐÐ_ÑÐÑ ÑÐÐ"
 
-#: ../widgets/misc/e-attachment-view.c:410
+#: ../widgets/misc/e-attachment-view.c:415
 msgid "_View Inline"
 msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÑÑÐÑ"
 
-#: ../widgets/misc/e-attachment-view.c:417
-#, fuzzy
-#| msgid "_View Inline"
+#: ../widgets/misc/e-attachment-view.c:422
 msgid "Vie_w All Inline"
-msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÑÑÐÑ"
+msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÐ ÑÐÑÑÐÑ"
 
-#: ../widgets/misc/e-attachment-view.c:734
+#: ../widgets/misc/e-attachment-view.c:739
 #, c-format
 msgid "Open with \"%s\""
 msgstr "ÐÑÐÐÑÐ ÑÐ â%sâ"
 
-#: ../widgets/misc/e-attachment-view.c:737
+#: ../widgets/misc/e-attachment-view.c:742
 #, 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
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1021
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A load operation is already in progress"
-msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ ÐÐÑ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐ ÐÐÑ Ñ ÑÐÐÑ"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 msgid "A save operation is already in progress"
-msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÐÑÐ ÐÐÑ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÐÑÐ ÑÐ ÐÐÑ Ñ ÑÐÐÑ"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1928
 #, c-format
 msgid "Could not load '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1931
 #, c-format
 msgid "Could not load the attachment"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ ÐÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÑÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ â%sâ"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2210
 #, c-format
 msgid "Could not open the attachment"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "ÐÐÐÑÐÐÑ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ"
 
 # * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2721
 #, c-format
 msgid "Could not save '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ â%sâ"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2724
 #, 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:359
 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:1255
+#: ../widgets/misc/e-calendar-item.c:1258
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "ÐÐÐÐÐ ÑÑÑÐÐÐ"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑ ÑÑÑÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "ÐÑÑÐÐ..."
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:505
 msgid "Date and Time"
 msgstr "ÐÐÑÑÐ Ð ÐÑÐÐÐ"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:526
 msgid "Text entry to input date"
 msgstr "ÐÐÐ ÑÐÐÑÑÐ ÐÐ ÑÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:548
 msgid "Click this button to show a calendar"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐ"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "_ÐÐÐÐ"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:672
 msgid "_Today"
 msgstr "_ÐÐÐÐÑ"
 
@@ -21736,7 +21387,7 @@ msgstr "_ÐÐÐÐÑ"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:680
 msgid "_None"
 msgstr "ÐÐÑÑ_Ð"
 
@@ -21747,133 +21398,129 @@ msgstr "ÐÐÑÑ_Ð"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:246
+#: ../widgets/misc/e-import-assistant.c:249
 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:263
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
 
-#: ../widgets/misc/e-import-assistant.c:273
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../widgets/misc/e-import-assistant.c:287
-#: ../widgets/misc/e-import-assistant.c:462
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
 
-#: ../widgets/misc/e-import-assistant.c:330
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
 msgid "Choose the destination for this import"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÑÐÐÐÐÐÐÐ:"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÐÐÑÐ ÐÐ _ÑÑÐÑÐÑÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:371
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "ÐÐÐÐÐ _ÑÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../widgets/misc/e-import-assistant.c:523
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
 "like to try again, please click the \"Back\" button."
 msgstr ""
-"ÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÑÐÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÑÐÐÐ: Pine, Netscape, "
-"Elm, iCalendar. ÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐ ÑÐÐÑÑÐ. ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ "
-"ÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ, ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ âÐÐÐÐÐâ."
+"ÐÐÐÐÑÑÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÑÐÐÐ: ÐÐÐÐ, ÐÐÑÑÐÐÑÐ, "
+"ÐÐÐ, ÐÐÐÐÐÐÐÐÑ. ÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ. ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÑÐÑÐ "
+"ÐÐÐÐÐÐ, ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ âÐÐÐÐÐâ."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:770
-#, fuzzy
-#| msgid "Cancel"
+#: ../widgets/misc/e-import-assistant.c:773
 msgid "_Cancel Import"
-msgstr "ÐÑÐÐÐÐ"
+msgstr "_ÐÑÐÐÐÐ ÑÐÐÐÐÑÐ"
 
-#: ../widgets/misc/e-import-assistant.c:912
-#, fuzzy
-#| msgid "Preview the message to be printed"
+#: ../widgets/misc/e-import-assistant.c:915
 msgid "Preview data to be imported"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑ ÐÑÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐÑÐ ÑÐ ÑÐÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1347
-#: ../widgets/misc/e-import-assistant.c:1356
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
 msgid "Import Data"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:929
 msgid "Select what type of file you want to import from the list."
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐ ÑÐÐÑÐÐ ÐÐÑÐ ÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ."
 
-#: ../widgets/misc/e-import-assistant.c:1271
-#: ../widgets/misc/e-import-assistant.c:1305
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Evolution Import Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÑÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:1288
-#: ../widgets/misc/e-import-assistant.c:1335
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
 msgid "Import Location"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
 
-#: ../widgets/misc/e-import-assistant.c:1299
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 msgstr ""
-"ÐÐÐÑÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÑÐÐÐ.\n"
+"ÐÐÐÑÐÐÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÑÐÐÐ.\n"
 "ÐÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐ ÐÐÑ ÐÑÐÐÐÑÑÐ ÐÑÐÐ ÐÐÑÑÑÐÐÐ ÑÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÑÐÑÐÐÐ Ñ "
 "ÐÐÐÐÑÑÐÑÑ."
 
-#: ../widgets/misc/e-import-assistant.c:1313
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Importer Type"
 msgstr "ÐÐÐ ÑÐÐÐÐÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Select Information to Import"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐÑÑ ÐÐ ÑÐÐÐ"
 
-#: ../widgets/misc/e-import-assistant.c:1328
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Select a File"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ âÐÑÐÐÐÐÐâ ÐÐ ÐÐÐÐÑÐÐÑÐ ÑÐÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ. "
 
-#: ../widgets/misc/e-map.c:624
+#: ../widgets/misc/e-map.c:557
 msgid "World Map"
 msgstr "ÐÐÑÑÐ ÑÐÐÑÐ"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:559
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21893,65 +21540,65 @@ 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:276
+#: ../widgets/misc/e-preferences-window.c:278
 msgid "Evolution Preferences"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 # bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "ÐÐÐÐÐÐÐÑÐ: %d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑ ÐÑÐÑÑÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "ÐÑÐ_ÐÐÑÐ:"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "ÐÑÐÑÑÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "_ÐÑÐÑÑÐÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:606
 msgid "Find the previous occurrence of the phrase"
-msgstr "ÐÐÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Next"
 msgstr "_ÐÐÐÐÐÑÐ"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:622
 msgid "Find the next occurrence of the phrase"
-msgstr "ÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Mat_ch case"
-msgstr "ÐÐ_ÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
+msgstr "ÐÐ_ÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:660
 msgid "Reached bottom of page, continued from top"
-msgstr "ÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐ, ÐÐÑÑÐÐÑÐÐÐ ÐÐ ÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐ ÑÐÐ ÐÐ ÐÐÐ ÑÑÑÐÐÐÑÐ, ÐÐÑÑÐÐÑÐÐ ÑÐ ÐÑÑÐ"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:682
 msgid "Reached top of page, continued from bottom"
-msgstr "ÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐ, ÐÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐ"
+msgstr "ÐÑÐÐÐÐ ÑÐÐ ÐÐ ÐÑÑÐ ÑÑÑÐÐÐÑÐ, ÐÐÑÑÐÐÑÐÐ ÑÐ ÐÐÐ"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 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"
@@ -21966,134 +21613,153 @@ msgid "Delivery Options"
 msgstr "ÐÐÑÐÑÐ ÐÑÐÐÑÑÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgid "For Your Eyes Only"
-msgstr "ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÑÐ"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_ÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_ÐÐÑÐÐ"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "ÐÐÐÐ"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "ÐÐ_ÑÑÐÑ"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "ÐÐÐÐ"
+
+#: ../widgets/misc/e-send-options.ui.h:11
+msgid "For Your Eyes Only"
+msgstr "ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÑÐ"
+
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "ÐÐÑ_ÑÐ ÐÐÑÐÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "ÐÐÐÑÐÐÑÐÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
-msgstr "ÐÐÑÑÐÐÐÐ Ð_ÐÐÐÐÐÑ"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ Ð_ÐÐÐÐÐÑ"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÑÑÐÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ÐÑÐÑÐÑÐ ÑÑÐ_ÑÑÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "ÐÑÐÐÐÐÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "ÐÑÐÑÐÑÐ ÑÑÐÑÑÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "ÐÑÑÐÐÐ ÐÐÐÐÑÑÐÐÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
-msgstr "ÐÐÐÐ ÑÐ ÐÑÐ_ÑÐÐÑÐÐÐ: "
+msgstr "ÐÐÐÐ ÑÐ _ÐÑÐÑÐÐÑÐÐÐ:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
-msgstr "ÐÐ ÐÐÐÑÑ_ÐÑÐÑ:"
+msgstr "ÐÐÐ ÑÐ _ÐÐÐÑÑÐÐÐ:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
-msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐ_ÑÐÐÐ:"
-
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "ÐÐ_ÑÑÐÑ"
+msgstr "ÐÐÐÐ ÑÐ _ÐÐÐÐÑÐÐÐ:"
 
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-#| msgid "_After:"
-msgid "_After"
-msgstr "_ÐÐÑÐÐ"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_ÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "_ÐÐÐÑÐÑÐÐÐÑÐÑÐ:"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "_ÐÐÐÐÐÐ ÐÑÐÐÑÑÐÑ ÐÐÑÑÐÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_ÐÑÐÐÑÑÑÐÐÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
-msgstr "_ÐÐÑÑÐÐÐ ÑÐÐ"
-
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-#| msgid "_Until:"
-msgid "_Until"
-msgstr "_ÐÐ"
+msgstr "ÐÐÑÑÐÐÐ _ÑÐÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
-msgstr "_ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐ Ð_ÐÐÐÐÐ"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../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.
+# 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: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "ÐÐÑÑÐ"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:555
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "ÐÐÐ ÐÐÐÐÐ"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "_ÐÐÑÑÐÐÑ Ð ÐÐÑÐÐÑÐ"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:422
 msgid "Edit Signature"
 msgstr "ÐÑÐÐÐ ÐÐÑÐÐÑ"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:437
 msgid "_Signature Name:"
 msgstr "ÐÐÐÐÐ _ÐÐÑÐÐÑÐ:"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
 msgid "Add Signature Script"
 msgstr "ÐÐÐÐÑ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÐÐÑ"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
 msgid "Edit Signature Script"
 msgstr "ÐÑÐÐÐ ÑÐÑÐÐÑÑ ÐÐÑÐÐÑÐ"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
 msgid "Add _Script"
 msgstr "ÐÐÐÐÑ ÑÐ_ÑÐÐÑÑ"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22103,56 +21769,56 @@ msgstr ""
 "ÐÐÑÐÐÑ. ÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ\n"
 "ÑÐÐÐ ÐÐ ÐÑÐÐÐÐ."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "Ð_ÐÑÐÐÑÐ:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÐÐ."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÑ"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "_ÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÐÐ"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
-msgstr "_ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÑÐÑÐÑÑ"
+msgstr "_ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐÑÑ"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:386
 msgid "Open the link in a web browser"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐ"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÑ"
 
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
-msgstr "_ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÐÑÑ"
+msgstr "_ÐÐÐÐÐÐ ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÐ ÑÐÐÑÑ Ð ÑÐÐÐÐ"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ %s"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ/ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ/ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÑÐ"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %s"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %s"
 
 #: ../widgets/misc/ea-calendar-item.c:299
 #: ../widgets/misc/ea-calendar-item.c:308
@@ -22172,7 +21838,7 @@ msgstr "ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 msgid "popup list"
 msgstr "ÐÑÐÐÑÑÑÐ ÐÐÑÑÐ"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:300
 msgid "Now"
 msgstr "ÐÐÐÐ"
 
@@ -22182,23 +21848,23 @@ msgstr "ÐÐÐÐ"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "Ð ÑÐÐÑ"
 
-#: ../widgets/table/e-cell-date-edit.c:872
+#: ../widgets/table/e-cell-date-edit.c:869
 #, c-format
 msgid "The time must be in the format: %s"
 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:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
@@ -22206,28 +21872,28 @@ msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑ 0 Ð 10
 msgid "click to add"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(ÐÐÑÑÑÑÐ)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(ÐÐÐÐÐÑÑÑÐ)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "ÐÐÑÐ ÑÐÐÐÑÑÑÐÐÐ"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "ÐÐÐ ÐÑÑÐÐÑÐÑÐ"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÐÑÐ"
 
@@ -22329,14 +21995,13 @@ msgstr ""
 #. Example: "Family name: Smith (13 items)"
 #.
 #: ../widgets/table/e-table-group-container.c:351
-#, fuzzy, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
+#, 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.
@@ -22351,7 +22016,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:1546
 msgid "Customize Current View"
@@ -22415,11 +22080,6 @@ msgstr "_ÐÑÐÐÐÐÐÑÐÐÐ"
 msgid "popup a child"
 msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÐÐÐ"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "ÐÐÑÐÐ ÑÑÐÑÐÐÐÑÐÐ ÐÐÐ ÑÐÐÐÑÐ"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -22428,12 +22088,12 @@ msgstr "ÐÐÑÐÑÐ ÑÐÐÐÑÐ"
 #. Translators: description of an "expand" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
-msgstr "ÑÐÐÐÑÐÐÐÐÐ ÑÐÐ Ñ ETree ÐÐÐ ÑÐ ÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgstr "ÑÐÐÐÑÐÐÐÐÐ ÑÐÐ Ñ ÐÑÑÐÐÐÐ ÐÐÑÐ ÑÐÑÐÐ ÐÐÑ ÑÐÐÐÑÑ"
 
 #. Translators: description of a "collapse" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
-msgstr "ÑÐÑÐÑÐ ÑÐÐ Ñ ETree ÐÐÐ ÑÐ ÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgstr "ÑÐÑÐÑÐ ÑÐÐ Ñ ÐÑÑÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ ÐÐÑ ÑÐÐÐÑÑ"
 
 #: ../widgets/table/gal-a11y-e-cell.c:119
 msgid "Table Cell"
@@ -22447,10 +22107,13 @@ msgstr "ÐÐÐÐ"
 msgid "sort"
 msgstr "ÑÐÐÐÑÑÑÐÐÐÑÐ"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2522
 msgid "Select All"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÐ"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2534
 msgid "Input Methods"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐ"
+
+#~ msgid "Unable to reconstruct message from autosave file"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÑÑÐÐÐÑÑÐÐÐ ÑÑÐÐÑÐ"
diff --git a/po/sr latin po b/po/sr latin po
index 9c1ae14..4f23b21 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,26 +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:567
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2010-08-12 05:37+0000\n"
-"PO-Revision-Date: 2010-09-22 15:01+0200\n"
-"Last-Translator: MiloÅ PopoviÄ <gpopac gmail com>\n"
+"product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-05-17 10:54+0000\n"
+"PO-Revision-Date: 2011-06-06 09:35+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: Serbian (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-Generator: Virtaal 0.5.2\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -41,15 +42,15 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "Adresa â{0}â veÄ postoji."
+msgstr "Adresa â{0}â veÄ postoji."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
-msgstr "Nije moguÄe dodati novi kontakt"
+msgstr "Ne mogu da dodam novi kontakt"
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
-msgstr "Kontakt nije moguÄe premestiti."
+msgstr "Ne mogu da premestim kontakt."
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
@@ -67,11 +68,11 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
 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
 msgid "Could not remove address book."
-msgstr "Nije moguÄe ukloniti adresar."
+msgstr "Ne mogu da uklonim adresar."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
@@ -79,17 +80,16 @@ msgid ""
 "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
 msgid "Delete address book '{0}'?"
-msgstr "Obrisati adresar â{0}â?"
+msgstr "Da obriÅem adresar â{0}â?"
 
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
-#| msgid "Do not delete"
 msgid "Do _Not Delete"
 msgstr "Ne _briÅi"
 
@@ -99,17 +99,17 @@ msgstr "GreÅka pri Äuvanju {0} u {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
-msgstr "Neuspela autentifikacija na LDAP server."
+msgstr "Nisam uspeo da potvrdim identitet na LDAP serveru."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
-msgstr "Neuspelo brisanje kontakta"
+msgstr "Nisam uspeo da obriÅem kontakt"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "Pravljenje GroupWise adresara:"
+msgstr "Stvaranje GroupVajz adresara:"
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
@@ -117,7 +117,7 @@ msgstr "LDAP server nije odgovorio ispravnom Åemom podataka."
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
-msgstr "Na tekuÄoj verziji servera neke opcije neÄe ispravno raditi"
+msgstr "Neke opcije neÄe ispravno raditi na vaÅem trenutnom serveru."
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
@@ -127,8 +127,8 @@ msgstr "Evolucijin adresar je neoÄekivano prestao da radi."
 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
 msgid ""
@@ -136,9 +136,9 @@ msgid ""
 "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
@@ -168,7 +168,7 @@ msgstr "Ovaj server ne podrÅava LDAPv3 Åemu podataka."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
-msgstr "NemoguÄe otvaranje adresara"
+msgstr "Ne mogu da otvorim adresar"
 
 #: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
@@ -176,11 +176,11 @@ msgstr "Pretraga nije moguÄa."
 
 #: ../addressbook/addressbook.error.xml.h:30
 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
 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
 msgid ""
@@ -196,8 +196,8 @@ 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 "
-"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
 msgid "You do not have permission to delete contacts in this address book."
@@ -207,7 +207,7 @@ msgstr "Nemate dovoljna ovlaÅÄenja da briÅete kontakte iz ovog adresara."
 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?"
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -239,7 +239,7 @@ msgstr "_Koristi tako kako je"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../calendar/gui/e-calendar-view.c:2024
 msgid "Anniversary"
 msgstr "_GodiÅnjica:"
 
@@ -250,19 +250,18 @@ msgstr "_GodiÅnjica:"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../calendar/gui/e-calendar-view.c:2023 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:132
 msgid "Birthday"
 msgstr "_RoÄendan:"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "Blog"
 msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
@@ -277,9 +276,9 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "UreÄivaÄ za kontakte"
 
@@ -302,14 +301,14 @@ msgid "Full _Name..."
 msgstr "Puno _ime..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 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"
@@ -317,7 +316,7 @@ msgstr "Slika"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
-msgstr "Brze poruke"
+msgstr "Trenutne poruke"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
@@ -345,10 +344,10 @@ msgid "Notes"
 msgstr "Napomene"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "Other"
 msgstr "Drugo"
 
@@ -369,12 +368,11 @@ msgid "Web Addresses"
 msgstr "Veb adrese"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#| msgid "Web Addresses"
 msgid "Web addresses"
 msgstr "Veb adrese"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -397,13 +395,12 @@ msgid "_Birthday:"
 msgstr "_RoÄendan:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#| msgid "Blog"
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalendar:"
@@ -482,74 +479,74 @@ msgstr "_Gde:"
 msgid "_Zip/Postal Code:"
 msgstr "PoÅ_tanski broj:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "DÅaber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
-msgstr "Yahoo"
+msgstr "Jahu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
-msgstr "ICQ"
+msgstr "ICKu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
-msgstr "GroupWise"
+msgstr "GroupVajz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "GreÅka pri dodavanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "GreÅka pri izmeni kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "GreÅka pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, 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:2987
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -557,23 +554,23 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, 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:3272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, 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:3287
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ%sâ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
@@ -663,7 +660,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:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "UreÄivaÄ kontakt liste"
 
@@ -686,32 +683,32 @@ 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:760
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "Älanovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "_Älanovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "GreÅka pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "GreÅka pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "GreÅka pri uklanjanju liste"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
-msgstr "Promenjen kontakt:"
+msgstr "Izmenjen kontakt:"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
@@ -727,8 +724,8 @@ msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"Ime ili elektronska adresa ovog kontakta veÄ postoji u ovoj fascikli.  "
-"Åelite li ipak da ga dodate?"
+"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,7 +741,7 @@ 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:241
@@ -764,7 +761,7 @@ msgstr "Pripoji kontakt"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 #: ../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
@@ -772,12 +769,12 @@ msgid "Any field contains"
 msgstr "Polje koje sadrÅi"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "E-poÅta poÄinje sa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "Ime sadrÅi"
 
@@ -800,7 +797,7 @@ msgstr "GreÅka pri uÄitavanju pregleda knjige"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
-msgstr "Pretraga prekinuta"
+msgstr "Pretraga je prekinuta"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
@@ -819,9 +816,9 @@ msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska iseÄaka"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:644
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
-msgstr "ObriÅi izabrane kontakte"
+msgstr "BriÅe izabrane kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
@@ -829,16 +826,16 @@ msgstr "OznaÄava sve vidljive kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "Sigurno Åelite da obriÅete ove kontakt liste?"
+msgstr "Sigurno Åelite da obriÅete ove liste kontakta?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
-msgstr "Sigurno Åelite da obriÅete ovu kontakt listu?"
+msgstr "Sigurno Åelite da obriÅete ovu listu kontakta?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Sigurno Åelite da obriÅete ovu kontakt listu (%s) ?"
+msgstr "Sigurno Åelite da obriÅete ovu listu kontakta (%s) ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
@@ -900,7 +897,7 @@ msgid "Car Phone"
 msgstr "Telefon u kolima"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../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
@@ -1019,7 +1016,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"
@@ -1035,7 +1032,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:183
 msgid ""
@@ -1059,7 +1056,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:189
 msgid ""
@@ -1145,7 +1142,7 @@ msgstr "Otvori"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
-msgstr "Kontakt lista: "
+msgstr "Lista kontakta: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
@@ -1160,17 +1157,17 @@ msgid "Copy _Email Address"
 msgstr "UmnoÅi elektronsku _adresu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:391
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "UmnoÅava adrese u spisak iseÄaka"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "_PoÅalji poruku za..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "Åalje poruku na ovu adresu"
 
@@ -1209,12 +1206,12 @@ msgstr "_Video razgovor:"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:491
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:498
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -1256,15 +1253,15 @@ msgstr "_Veb log:"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:115
-#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../capplet/settings/mail-capplet-shell.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-cal-shell-migrate.c:157
 #: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-memo-shell-migrate.c:115
 #: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../modules/calendar/e-task-shell-migrate.c:124
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "LiÄno"
@@ -1282,12 +1279,12 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da poÅaljete %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1297,16 +1294,16 @@ msgstr ""
 "koriÅÄenje van mreÅe ili da joÅ nije preuzet za rad van mreÅe. UÄitajte "
 "adresar kada se poveÅete radi preuzimanja njegovog sadrÅaja."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:81
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
-"Nije moguÄe otvaranje ovog adresara.  Proverite da putanja %s postoji i da "
+"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:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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."
@@ -1315,31 +1312,31 @@ msgstr ""
 "koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
 "podrÅkom za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 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:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "Detalji greÅke:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this 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."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1347,57 +1344,54 @@ 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."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
-#| msgid "The backend for this address book was unable to parse this query."
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
-#| msgid "The backend for this address book refused to perform this query."
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
-#| msgid "This query did not complete successfully."
 msgid "This query did not complete successfully. %s"
 msgstr "Ovaj upit nije uspeÅno zavrÅen. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "Izaberi adresar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:287
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:414
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:416
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "UmnoÅi kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:421
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "UmnoÅi kontakte u"
 
@@ -1411,19 +1405,19 @@ msgstr "Pregled karte"
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "UvoÅenje..."
+msgstr "Uvozim..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:1008
 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:1009
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV i Tab uvoznik"
+msgstr "Autluk CSV i Tab uvoznik"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1017
 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:1018
 msgid "Mozilla CSV and Tab Importer"
@@ -1451,86 +1445,85 @@ msgstr "vKarta (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:624
 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:746
 #, c-format
-#| msgid "Page %d of %d"
 msgid "Page %d"
-msgstr "%d. stranica"
+msgstr "%d stranica"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 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:42
 msgid "Couldn't get list of address books"
-msgstr "Lista adresara nije dostupna"
+msgstr "Ne mogu da dobavim listu adresara"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
-msgstr "neuspelo otvaranje knjige"
+msgstr "nisam uspeo da otvorim knjigu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
-msgstr "Spisak fascikli lokalnog adresara"
+msgstr "Navodi fascikle lokalnog adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 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:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 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:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 "Broj karti u jednoj izlaznoj datoteci u neusklaÄenom reÅimu, podrazumevana "
-"veliÄina 100."
+"veliÄina je 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 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:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 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:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "U neusklaÄenom reÅimu, izlaz mora biti datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom reÅimu, nema potrebe za podeÅavanjem veliÄine."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "Nepoznata greÅka"
 
@@ -1541,7 +1534,7 @@ msgstr "Anonimno pristupanje LDAP serveru"
 #: ../addressbook/util/addressbook.c:215
 #: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
-msgstr "Neuspela autentifikacija.\n"
+msgstr "Nisam uspeo da potvrdim identitet.\n"
 
 #: ../addressbook/util/addressbook.c:222
 #: ../plugins/groupwise-features/camel-gw-listener.c:506
@@ -1550,7 +1543,7 @@ msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
 
 #: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:55
+#: ../calendar/common/authentication.c:53
 #: ../plugins/caldav/caldav-browse-server.c:813
 #: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
@@ -1573,80 +1566,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}'?"
@@ -1654,7 +1647,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
@@ -1684,7 +1677,7 @@ msgstr "Sigurno Åelite da obriÅete ovaj sastanak?"
 #: ../calendar/gui/dialogs/delete-comp.c:197
 #, 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:194
@@ -1693,40 +1686,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"
@@ -1734,11 +1723,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."
@@ -1752,7 +1741,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."
@@ -1802,7 +1791,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:48
 msgid ""
@@ -1810,15 +1799,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:49
 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:50
 msgid ""
@@ -1874,7 +1863,7 @@ msgstr "Ovaj spisak zadataka Äe biti trajno uklonjen."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
-msgstr "Åelite li da saÄuvate promene u zakazivanju?"
+msgstr "Åelite li da saÄuvate izmene u zakazivanju?"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
@@ -1882,11 +1871,11 @@ msgstr "Åelite li da saÄuvate izmene na ovom sastanku?"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
-msgstr "Åelite li da saÄuvate promene na ovoj beleÅci?"
+msgstr "Åelite li da saÄuvate izmene na ovoj beleÅci?"
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
-msgstr "Åelite li da saÄuvate promene na ovom zadatku?"
+msgstr "Åelite li da saÄuvate izmene na ovom zadatku?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
@@ -1899,19 +1888,19 @@ msgstr "Åelite li da poÅaljete svim uÄesnicima obaveÅtenje o otkazivanju?"
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "Åelite li da poÅaljete pozive na sastanak uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima pozive na sastanak?"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
-msgstr "Åelite li da poÅaljete ovaj zadatak uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "Åelite li da poÅaljete osveÅene podatke o sastanku uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima osveÅene podatke o sastanku?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
-msgstr "Åelite li da poÅaljete osveÅene podatke o zadatku uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima osveÅene podatke o zadatku?"
 
 #: ../calendar/calendar.error.xml.h:72
 msgid ""
@@ -1919,49 +1908,49 @@ 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:73
 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:74
 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:75
 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:76
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "Promenili ste ovu beleÅku, ali promene joÅ niste saÄuvali."
+msgstr "Izmenili ste ovu beleÅku, ali joÅ niste saÄuvali."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Kalendari neÄe biti dostupni dok se Evolucija ponovo ne pokrene."
+msgstr "Kalendari neÄe biti dostupni sve dok ponovo ne pokrenete Evoluciju."
 
 #: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr "BeleÅka neÄe biti dostupna dok se Evolucija ponovo ne pokrene."
+msgstr "BeleÅke neÄe biti dostupne sve dok ponovo ne pokrenete Evoluciju."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Zadaci neÄe biti dostupni dok se Evolucija ponovo ne pokrene."
+msgstr "Zadaci neÄe biti dostupni sve dok ponovo ne pokrenete Evoluciju."
 
 #: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
-msgstr "_Zanemari promene"
+msgstr "_Odbaci izmene"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "_SaÄuvaj"
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
-msgstr "SaÄuvaj pro_mene"
+msgstr "SaÄuvaj iz_mene"
 
 #: ../calendar/calendar.error.xml.h:83
 #: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
@@ -1974,7 +1963,7 @@ msgid "_Send Notice"
 msgstr "PoÅalji po_dsetnik"
 
 # bug: plural-forms
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -1982,7 +1971,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -1990,7 +1979,7 @@ msgstr[1] "sata"
 msgstr[2] "sati"
 msgstr[3] "sat"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "Vreme poÄetka"
 
@@ -2005,8 +1994,8 @@ msgstr "Zanemari _sve"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
 #: ../calendar/gui/e-itip-control.c:1175
 #: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
@@ -2021,43 +2010,33 @@ msgid "_Dismiss"
 msgstr "_Zanemari"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "_UreÄivanje"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "Dre_manje"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "sati"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "zakazana lokacija"
 
 # bug: plural-forms
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minuta"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "Nema dostupnog saÅetka."
 
@@ -2076,25 +2055,25 @@ msgstr "Nema dostupnog podatka o lokaciji."
 msgid "You have %d alarms"
 msgstr "Broj postavljenih alarma: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 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:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2104,14 +2083,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:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -2192,11 +2171,11 @@ msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
-msgstr "SaÅmi vikende u meseÄni pregled"
+msgstr "SaÅimanje vikenda u meseÄni pregled"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
-msgstr "Potvrdi praÅnjenje"
+msgstr "Potvrda praÅnjenja"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
@@ -2204,7 +2183,7 @@ msgstr "Broj podrazumevanih ponavljanja novog dogaÄaja. -1 znaÄi zauvek."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Potrebno je oznaÄiti dane kojima poÄinju i zavrÅavaju se radni Äasovi."
+msgstr "Dani u kojima trebaju biti naznaÄeni poÄetni i zavrÅni radni Äasovi."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
@@ -2212,7 +2191,7 @@ msgstr "Podrazumevani podsetnik za zakazivanje"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
-msgstr "Podrazumevan broj ponavljanja"
+msgstr "Podrazumevani broj ponavljanja"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
@@ -2248,38 +2227,38 @@ msgstr "Stepen dogaÄaja u pregledu kalendara."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
-msgstr "Sakrij zavrÅene zadatke"
+msgstr "Skrivanje zavrÅenih zadataka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
-msgstr "Sakrij jedinice zadataka"
+msgstr "Skrivanje jedinica zadatka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
-msgstr "Sakrij vrednost zadataka"
+msgstr "Sakrivanje vrednosti zadataka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
-msgstr "Pozicija poloÅene povrÅi"
+msgstr "PoloÅaj poloÅene povrÅi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
-"Sat kojim se zavrÅava radna nedelja, u dvadesetÄetvoroÄasovnom obliku, od 0 "
-"do 23."
+"Sat kojim se zavrÅava radni dan, u dvadesetÄetvoroÄasovnom obliku, od 0 do "
+"23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
-"Sat kojim poÄinje radna nedelja, u dvadesetÄetvoroÄasovnom obliku, od 0 do 23."
+"Sat kojim poÄinje radni dan, u dvadesetÄetvoroÄasovnom obliku, od 0 do 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "Ukoliko je âtaÄnoâ, u glavnom prozoru prikazuje pregled beleÅki."
+msgstr "Ukoliko je izabrano, pregled beleÅke biÄe prikazan u glavnom prozoru."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
-msgstr "Ukoliko je âtaÄnoâ, u glavnom prozoru prikazuje pregled zadataka."
+msgstr "Ukoliko je izabrano, pregled zadatka biÄe prikazan u glavnom prozoru."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2308,11 +2287,11 @@ msgstr "Markus Bejns linija"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Boja Markus Bejns linije - Dnevni pregled"
+msgstr "Boja Markus Bejns linije â Dnevni pregled"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Boja Markus Bejns linije - traka vremena"
+msgstr "Boja Markus Bejns linije â traka vremena"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
@@ -2332,11 +2311,11 @@ msgstr "Stil razmeÅtaja beleÅke"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
-msgstr "Pozicija pregleda beleÅki (vertikalno)"
+msgstr "PoloÅaj pregleda beleÅki (poloÅeno)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
-msgstr "Pozicija pregleda beleÅke (vertikalno)"
+msgstr "PoloÅaj pregleda beleÅke (uspravno)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
@@ -2348,11 +2327,11 @@ msgstr "Minut kojim poÄinje radni dan, od 0 do 59."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
-msgstr "Pozicija poloÅene povrÅi MeseÄnog pregleda"
+msgstr "PoloÅaj poloÅene povrÅi MeseÄnog pregleda"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
-msgstr "Pozicija uspravne povrÅi MeseÄnog pregleda"
+msgstr "PoloÅaj uspravne povrÅi MeseÄnog pregleda"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
@@ -2371,35 +2350,35 @@ msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"Pozicija poloÅene povrÅi, izmeÄu dela kalendara za datum i spiska zadataka "
-"kada nije postavljen meseÄni pregled, u pikselima."
+"PoloÅaj poloÅene povrÅi, izmeÄu dela kalendara za datum i spiska zadataka "
+"kada nije postavljen meseÄni pregled, u taÄkama."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"Pozicija poloÅene povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
-"zadataka u meseÄnom pregledu, u pikselima."
+"PoloÅaj poloÅene povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
+"zadataka u meseÄnom pregledu, u taÄkama."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Pozicija pregleda beÄeÅki kada je postavljeno vertikalno."
+msgstr "PoloÅaj pregleda beleÅki kada je postavljeno uspravno."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Pozicija pregleda zadataka kada je postavljeno horizontalno."
+msgstr "PoloÅaj pregleda zadataka kada je postavljeno poloÅeno."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
-msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno."
+msgstr "PoloÅaj pregleda zadataka kada je postavljeno uspravno."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr ""
-"PoloÅaj uspravne povrÅi, izmeÄu liste kalendara i navigacije kalendara po "
+"PoloÅaj uspravne povrÅi, izmeÄu liste kalendara i pretrage kalendara po "
 "datumu."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
@@ -2407,16 +2386,16 @@ msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"Pozicija uspravne povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
-"zadataka u meseÄnom pregledu, u pikselima."
+"PoloÅaj uspravne povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
+"zadataka u meseÄnom pregledu, u taÄkama."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"Pozicija uspravne povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
-"zadataka kada nije postavljen meseÄni pregled, u pikselima."
+"PoloÅaj uspravne povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
+"zadataka kada nije postavljen meseÄni pregled, u taÄkama."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
@@ -2448,11 +2427,13 @@ msgstr "MeseÄni pregled po nedeljama"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "PrikaÅi RSVP polje u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
+msgstr ""
+"Prikazuje RSVP polje (molim odgovorite) u ureÄivaÄu dogaÄaja/zadataka/"
+"sastanaka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "PrikaÅi polje uloge u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
+msgstr "Prikazuje polje uloge u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
@@ -2460,7 +2441,7 @@ msgstr "Prikazuje vremena zakazanog zavrÅetka u nedeljnim i meseÄnim pregledim
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "PrikaÅi polje kategorije u ureÄivaÄu dogaÄaja/sastanaka/zadataka"
+msgstr "Prikazuje polje kategorije u ureÄivaÄu dogaÄaja/sastanaka/zadataka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
@@ -2468,7 +2449,7 @@ msgstr "Prikazuje alarme u obaveÅtajnoj zoni"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
-msgstr "PrikaÅi polje stanja u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
+msgstr "Prikazuje polje stanja u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
@@ -2480,17 +2461,17 @@ msgstr "Prikazuje pregled zadataka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
-msgstr "PrikaÅi polje vremenske zone u ureÄivaÄu dogaÄaja/sastanaka"
+msgstr "Prikazuje polje vremenske zone u ureÄivaÄu dogaÄaja/sastanaka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
-msgstr "PrikaÅi polje tipa u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
+msgstr "Prikazuje polje tipa u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-#, fuzzy
-#| msgid "Show week number in Day and Work Week View"
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "Prikazuje broj nedelje u dnevnom i pregledu za radnu nedelju"
+msgstr ""
+"Prikazuje broj nedelje u Dnevnom pregledu, Pregledu radne nedelje i "
+"PretraÅivaÄu datuma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
@@ -2498,7 +2479,8 @@ msgid ""
 "used in a 'timezone' key."
 msgstr ""
 "Prikazuje drugu vremensku zonu u Dnevnom pregledu, ukoliko je podeÅena. "
-"Vrednost je sliÄna onoj koja je koriÅÄena u kljuÄu âtimezoneâ."
+"Vrednost je sliÄna onoj koja je koriÅÄena u kljuÄu âtimezoneâ (vremenska "
+"zona)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
@@ -2506,15 +2488,15 @@ msgstr "Stil razmeÅtaja"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
-msgstr "Pozicija pregleda zadataka (horizontalno)"
+msgstr "PoloÅaj pregleda zadataka (poloÅeno)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
-msgstr "Pozicija pregleda zadataka (vertikalno)"
+msgstr "PoloÅaj pregleda zadataka (uspravno)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
-msgstr "Boja zadatka za danas"
+msgstr "Boja danaÅnjeg zadatka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
@@ -2522,7 +2504,7 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"Model adrese za koriÅÄenje u povraÄaju vremena slobodno/zauzeto, %u se "
+"Åablon adrese za koriÅÄenje u povraÄaju vremena slobodno/zauzeto, %u se "
 "zamenjuje korisniÄkim delom elektronske adrese, a %d domenom."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
@@ -2539,9 +2521,9 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
-"Stil razmeÅtaja utvrÄuje poloÅaj pregleda u odnosu na spisak beleÅki. "
-"â0â (klasiÄan pregled) postavlja pregled ispod spiska beleÅki. "
-"â1â (vertikalan pregled) postavlja pregled pored spiska beleÅki."
+"Stil razmeÅtaja utvrÄuje poloÅaj pregleda u odnosu na spisak beleÅki. 0 â "
+"(klasiÄan pregled) postavlja pregled ispod spiska beleÅki. 1 â (uspravan "
+"pregled) postavlja pregled pored spiska beleÅki."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
@@ -2549,9 +2531,9 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"Stil razmeÅtaja utvrÄuje poloÅaj pregleda u odnosu na spisak zadataka. "
-"â0â (klasiÄan pregled) postavlja pregled ispod spiska zadataka. "
-"â1â (vertikalan pregled) postavlja pregled pored spiska zadataka."
+"Stil razmeÅtaja utvrÄuje poloÅaj pregleda u odnosu na spisak zadataka. 0 â "
+"(klasiÄan pregled) postavlja pregled ispod spiska zadataka. 1 â (uspravan "
+"pregled) postavlja pregled pored spiska zadataka."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
@@ -2562,7 +2544,7 @@ msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"MoÅe imati tri vrednosti. 0 za greÅke. 1 za upozorenja. 2 za poruke o "
+"MoÅe imati tri vrednosti: 0 â za greÅke, 1 â za upozorenja i 2 â za poruke o "
 "dijagnozi kvara."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
@@ -2571,7 +2553,7 @@ msgstr "Podela vremena"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
-msgstr "Vreme poslednjeg pokretanja alarma, u time_t."
+msgstr "Vreme poslednjeg pokretanja alarma, u time_t (vreme_t)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
@@ -2582,8 +2564,8 @@ msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
-"Providnost dokaÄaja u pregledu kalendara, vrednost izmeÄu 0 (providno) i 1 "
-"(neprovidno)"
+"Providnost dogaÄaja u pregledu kalendara, vrednost izmeÄu 0 â (providno) i 1 "
+"â (neprovidno)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
@@ -2613,7 +2595,7 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
-msgstr "Koristi vremensku zonu sistema"
+msgstr "KoriÅÄenje vremenske zone sistema"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
@@ -2634,37 +2616,39 @@ msgstr "Dan kojim poÄinje nedelja, od nedelje (0) do subote (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Da li da koristi obaveÅtajnu zonu za prikazivanje alarma."
+msgstr "Da li Äe obaveÅtajna zona biti koriÅÄena za prikazivanje alarma."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Da li da traÅi potvrdu za brisanje zakazivanja ili zadatka."
+msgstr "Da li Äe da traÅi potvrdu za brisanje zakazivanja ili zadatka."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Da li da traÅi potvrdu pri izbacivanjuzakazivanja ili zadatka."
+msgstr "Da li Äe da traÅi potvrdu pri izbacivanju zakazivanja ili zadatka."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"Da li da saÅme vikende u meseÄnom pregledu, koji subotu i nedelju stavlja u "
+"Da li Äe da saÅme vikende u meseÄnom pregledu, koji subotu i nedelju stavlja u "
 "prostor radne nedelje."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
-"Da li da prikaÅe vremena zavrÅetka dogaÄaja u nedeljnim i meseÄnim pregledima."
+"Da li Äe da prikaÅe vremena zavrÅetka dogaÄaja u nedeljnim i meseÄnim "
+"pregledima."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)."
+msgstr ""
+"Da li Äe u kalendaru da iscrta Markus Bejns liniju (na trenutno vreme)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Da li da sakrije zavrÅene zadatke u pregledu zadataka."
+msgstr "Da li Äe da sakrije zavrÅene zadatke u pregledu zadataka."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
@@ -2676,7 +2660,9 @@ msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Da li da prikaÅe polje RSVP u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
+msgstr ""
+"Da li da prikaÅe polje RSVP (molim odgovorite) u ureÄivaÄu dogaÄaja/zadataka/"
+"sastanaka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
@@ -2694,7 +2680,7 @@ msgstr "Da li da prikaÅe polje statusa u ureÄivaÄu dogaÄaja/zadataka/sastana
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Da li da prikaÅe vreme u dvadesetoÄasovnom formatu, umesto am/pm."
+msgstr "Da li da prikaÅe vreme u dvadesetoÄasovnom formatu, umesto prep./pop.."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -2705,10 +2691,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"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-#, fuzzy
-#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "Da li da prikaÅe brojeve nedelja u delu za datum."
+msgstr "Da li da pokaÅe brojeve sedmica na raznim mestima u kalendaru."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
@@ -2716,7 +2700,7 @@ msgstr "Radni dani"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
-msgstr "Äas kojim se zavrÅava radni dan"
+msgstr "Sat kojim se zavrÅava radni dan"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
@@ -2724,7 +2708,7 @@ msgstr "Minut kojim se zavrÅava radni dan"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
-msgstr "Äas kojim poÄinje radni dan"
+msgstr "Sat kojim poÄinje radni dan"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
@@ -2764,7 +2748,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
@@ -2776,7 +2760,7 @@ msgid "Classification"
 msgstr "Razvrstavanje"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/e-cal-model.c:535 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2786,7 +2770,7 @@ msgstr "Poverljivo"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Opis"
@@ -2820,13 +2804,13 @@ msgid "Organizer"
 msgstr "Organizator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:533 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "LiÄno"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-cal-model.c:531
 #: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Javno"
@@ -2901,17 +2885,17 @@ msgid "Add Alarm"
 msgstr "Dodaj alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
 msgstr "Alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
-msgstr "PrilagoÄena _poruka"
+msgstr "Proizvoljna _poruka"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
-msgstr "PrilagoÄen zvuk alarma"
+msgstr "Proizvoljan zvuk alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
@@ -2927,7 +2911,7 @@ 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:"
@@ -2957,20 +2941,16 @@ msgstr "posle"
 msgid "before"
 msgstr "pre"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "dan(i)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "dana"
 
@@ -3006,7 +2986,7 @@ msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "Alarmi"
 
@@ -3018,6 +2998,7 @@ msgstr "Alarmi"
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
@@ -3034,19 +3015,17 @@ msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za koje zvoni sat"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-#| msgid "Time and date:"
 msgid "Ti_me and date:"
 msgstr "_Vreme i datum:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#| msgid "Date only:"
 msgid "_Date only:"
 msgstr "Samo _datum:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u i %d Äe biti zamenjeni korisnikom i domenom iz elektronske adrese."
+msgstr "%u i %d Äe biti zamenjeni korisnikom i domenom iz adrese e-poÅte."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
@@ -3118,8 +3097,8 @@ msgstr "Petak"
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2676
+#: ../modules/addressbook/addressbook-config.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:2680
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3140,206 +3119,192 @@ msgstr "Minuti"
 msgid "Monday"
 msgstr "Ponedeljak"
 
-# 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 not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "NiÅta"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
 #: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "Bira boju"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "N_ed"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "Pri_kazuje MeseÄni pregled po nedeljama"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "Dru_ga zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm 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"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 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"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "PrikaÅi _podsetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#| msgid "Show week _numbers in date navigator"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show week _numbers"
 msgstr "PrikaÅi _brojeve nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "U_to"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 #: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Spisak zadataka"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
-msgstr "Model:"
+msgstr "Åablon:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Äetvrtak"
 
 # note(slobo): moÅda treba rok
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
+#: ../widgets/misc/e-dateedit.c:595
 msgid "Time"
 msgstr "Vreme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "Koristi vremensku zonu _sistema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Sreda"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "PoÄetak n_edelje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 #: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Radna nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
-msgstr "_12 - Äasovni (AM/PM)"
+msgstr "_12-Äasovni (PrP/PoP)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
-msgstr "_24 - Äasovni"
+msgstr "_24-Äasovni"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "_TraÅi potvrdu za brisanje stavki"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "_SaÅmi nedelje u meseÄni pregled"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "PoÄetak _dana:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij zavrÅene zadatke posle"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "_Neispunjeni zadaci:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "_PrikaÅi zakazana vremena zavrÅetka u nedeljnim i meseÄnim pregledima"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "Podele _vremena:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "_Uto"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "_Sre"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 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"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "pre svakog zakazivanja"
 
@@ -3356,7 +3321,7 @@ msgstr "_Tip:"
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_Ime:"
 
@@ -3394,7 +3359,7 @@ msgstr "Osobine spiska zadataka"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
-msgstr "No_vi spisak zadataka"
+msgstr "Novi spisak zadataka"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
@@ -3402,7 +3367,7 @@ msgstr "Osobine spiska zadataka"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:589
 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."
@@ -3419,34 +3384,35 @@ 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:448
 #, c-format
@@ -3455,11 +3421,11 @@ msgstr "GreÅka provere: %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:246
 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:522
 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:637
 msgid "Edit Appointment"
@@ -3468,27 +3434,27 @@ msgstr "Uredi zakazivanje"
 #: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
-msgstr "Sastanak - %s"
+msgstr "Sastanak â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
-msgstr "Zakazivanje - %s"
+msgstr "Zakazivanje â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Dodeljen zadatak - %s"
+msgstr "Dodeljen zadatak â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
-msgstr "Zadatak - %s"
+msgstr "Zadatak â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
-msgstr "BeleÅka - %s"
+msgstr "BeleÅka â %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
@@ -3504,23 +3470,23 @@ msgstr "Pritisnite ovde da zatvorite tekuÄi prozor"
 
 #: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
-msgstr "UmnoÅi izabrano"
+msgstr "UmnoÅite izabrano"
 
 #: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1055
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
-msgstr "Iseci izabrano"
+msgstr "Isecite izabrano"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1004
 #: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
-msgstr "ObriÅi izbor"
+msgstr "ObriÅite izbor"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
@@ -3528,10 +3494,10 @@ msgstr "Pritisnite ovde za dostupnu pomoÄ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1067
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
-msgstr "Ubaci iz spiska iseÄaka"
+msgstr "Ubacite iz spiska iseÄaka"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
@@ -3539,17 +3505,26 @@ msgstr "Pritisnite ovde da saÄuvate tekuÄi prozor"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
-msgstr "Izaberi sav tekst"
+msgstr "Izaberite sav tekst"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "Ozna_ka"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_UreÄivanje"
+
 #: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "Dato_teka"
 
@@ -3563,23 +3538,23 @@ msgid "_Insert"
 msgstr "_Umetni"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_Opcije"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "P_regled"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:240
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
-msgstr "Pritisnite ovde da priloÅite dokument"
+msgstr "Kliknite ovde da priloÅite dokument"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
@@ -3587,7 +3562,7 @@ msgstr "Ka_tegorije"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
-msgstr "Bira da li da prikaÅe kategorije"
+msgstr "Prebacuje prikazivanje kategorija"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
@@ -3595,7 +3570,7 @@ msgstr "Vremenska _zona"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1125
 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:1134
 msgid "Pu_blic"
@@ -3603,7 +3578,7 @@ msgstr "_Javno"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
-msgstr "OznaÄi kao javno"
+msgstr "OznaÄite kao javno"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
@@ -3611,7 +3586,7 @@ msgstr "L_iÄno"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
-msgstr "OznaÄi kao liÄno"
+msgstr "OznaÄite kao liÄno"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
@@ -3619,39 +3594,39 @@ msgstr "Pove_rljivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
-msgstr "OznaÄi kao poverljivo"
+msgstr "OznaÄite kao poverljivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
-msgstr "_Uloga polje"
+msgstr "Polje _uloge"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1160
 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:1166
 msgid "_RSVP"
-msgstr "_RSVP"
+msgstr "_Molim odgovorite"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1168
 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:1174
 msgid "_Status Field"
-msgstr "_Stanje polje"
+msgstr "Polje _stanja"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1176
 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:1182
 msgid "_Type Field"
-msgstr "_Tip polja"
+msgstr "Polje _tipa"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1184
 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:1208
 #: ../composer/e-composer-private.c:70
@@ -3659,7 +3634,7 @@ msgid "Recent _Documents"
 msgstr "SkoraÅnji _dokumenti"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "PriloÅi"
 
@@ -3677,15 +3652,15 @@ msgstr "prilog"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3118
 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:92
 msgid "Could not open source"
-msgstr "Nije moguÄe otvaranje izvora"
+msgstr "Ne mogu da otvorim izvor"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:100
 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:109
 msgid "Destination is read only"
@@ -3693,84 +3668,76 @@ msgstr "OdrediÅte je samo za Äitanje"
 
 #: ../calendar/gui/dialogs/delete-comp.c:214
 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:217
-#| msgid "P_ercent complete:"
 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..."
@@ -3790,7 +3757,7 @@ msgstr "Ala_rmi"
 
 #: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
-msgstr "Pritisnite ovde da postavite ili iskljuÄite alarm za ovaj dogaÄaj"
+msgstr "Kliknite ovde da postavite ili iskljuÄite alarm za ovaj dogaÄaj"
 
 #: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Show Time as _Busy"
@@ -3798,7 +3765,7 @@ msgstr "PrikaÅi vreme kao _zauzeto"
 
 #: ../calendar/gui/dialogs/event-editor.c:229
 msgid "Toggles whether to show time as busy"
-msgstr "Bira da li da prikaÅe vreme kao zauzeto"
+msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
 #: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
@@ -3810,15 +3777,15 @@ msgstr "Neka se ovaj dogaÄaj ponavlja"
 
 #: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Opcije slanja"
 
 #: ../calendar/gui/dialogs/event-editor.c:247
 #: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
-msgstr "Umetni napredne opcije slanja"
+msgstr "Umetnite napredne opcije slanja"
 
 #: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
@@ -3836,21 +3803,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:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2674
 msgid "Appointment"
 msgstr "Zakazivanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-editor.c:387
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "UÄesnici"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
-#, fuzzy
-#| msgid "Print this message"
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
-msgstr "Åtampaj ovu poruku"
+msgstr "Åtampajte ovu poruku"
 
 #: ../calendar/gui/dialogs/event-page.c:766
 msgid "Event's start time is in the past"
@@ -3871,7 +3836,7 @@ msgid "This event has alarms"
 msgstr "Ovaj dogaÄaj ima alarme"
 
 #: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
@@ -3930,7 +3895,7 @@ msgstr "Najmanje jedan uÄesnik je potreban."
 #: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Nije moguÄe otvaranje kalendara â%sâ."
+msgstr "Ne mogu da otvorim kalendar â%sâ."
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -3987,84 +3952,82 @@ msgctxt "cal-alarms"
 msgid "None"
 msgstr "NiÅta"
 
-#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 day before appointment"
-msgstr "1 dan pre zakazanog sastanka"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgid "1 hour before appointment"
-msgstr "1 sat pre zakazanog sastanka"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "15 minutes before appointment"
-msgstr "15 minuta pre zakazanog sastanka"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Atte_ndees..."
 msgstr "UÄ_esnici..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Custom Alarm:"
-msgstr "PrilagoÄen alarm:"
+msgstr "Proizvoljan alarm:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "Opis dogaÄaja"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 #: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Lokacija:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#| msgid "Summary:"
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_SaÅetak:"
 
 # note(slobo): moÅda treba rok
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Vreme:"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 dan pre zakazanog sastanka"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 sat pre zakazanog sastanka"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+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
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "eventpage"
 msgid "for"
 msgstr "za"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
 msgstr "do"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2678
 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 eleÅku"
 
 #: ../calendar/gui/dialogs/memo-page.c:338
 msgid "Memo's start date is in the past"
@@ -4081,12 +4044,12 @@ msgstr "BeleÅku nije moguÄe potpuno urediti, poÅto niste organizator"
 #: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "Nije moguÄe otvaranje beleÅki u â%sâ."
+msgstr "Ne mogu da otvorim beleÅke u â%sâ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:269
-#: ../em-format/em-format.c:1026 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2299
+#: ../mail/em-format-html.c:2358 ../mail/em-format-html.c:2382
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Prima"
 
@@ -4156,13 +4119,13 @@ msgstr "Datum ponavljanja nije ispravan"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
-msgstr "Vreme zavrÅetka ponavljanja je ispred poÄetka dogaÄaja"
+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:961
 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
@@ -4170,7 +4133,7 @@ msgstr "na"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1018
 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]'
@@ -4179,7 +4142,7 @@ msgstr "prvoj"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1024
 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
@@ -4187,7 +4150,7 @@ msgstr "drugoj"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1029
 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
@@ -4195,7 +4158,7 @@ msgstr "treÄoj"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1034
 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
@@ -4203,7 +4166,7 @@ msgstr "Äetvrtoj"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1039
 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
@@ -4211,7 +4174,7 @@ msgstr "peti"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1044
 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]).
@@ -4244,7 +4207,7 @@ msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (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:1111
 msgid "day"
@@ -4267,15 +4230,15 @@ msgstr "Dodaj izuzetak"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
-msgstr "Ne moÅe da naÄe izbor radi menjanja."
+msgstr "Ne mogu da naÄem izbor radi menjanja."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
-msgstr "Izmeni izuzetak"
+msgstr "Izmenite izuzetak"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
-msgstr "Ne moÅe da naÄe izbor radi brisanja."
+msgstr "Ne mogu da naÄem izbor radi brisanja."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
@@ -4298,22 +4261,44 @@ msgid "This appointment rec_urs"
 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
+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
+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
+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
+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
+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
+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
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "godina(e)"
 
@@ -4340,7 +4325,7 @@ msgstr "Veb stranica"
 #: ../calendar/gui/e-cal-model-tasks.c:443
 #: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../calendar/gui/print.c:2761 ../mail/em-sync-stream.c:151
 #: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
 #, c-format
 msgid "Canceled"
@@ -4355,7 +4340,7 @@ msgstr "Otkazano"
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
 #: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/print.c:2758 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ZavrÅeno"
@@ -4364,9 +4349,9 @@ msgstr "ZavrÅeno"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../mail/message-list.c:1183 ../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
@@ -4375,7 +4360,7 @@ msgstr "Visoka"
 #: ../calendar/gui/e-cal-model-tasks.c:713
 #: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2669
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "U toku"
 
@@ -4383,18 +4368,18 @@ msgstr "U toku"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../mail/message-list.c:1181 ../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:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/e-cal-model.c:1279 ../calendar/gui/e-task-table.c:512
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../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
@@ -4402,9 +4387,9 @@ msgstr "ObiÄna"
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:2752 ../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:"
@@ -4418,7 +4403,7 @@ msgstr "_Stanje:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-calendar-view.c:1777
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4429,16 +4414,16 @@ msgstr "Status"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
 #: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.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:"
 msgstr "_Datum zavrÅetka:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_VaÅnost:"
 
@@ -4452,15 +4437,15 @@ msgstr "Det_alji statusa"
 
 #: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
-msgstr "Klikni za promenu ili detaljan pregled statusa zadatka"
+msgstr "Kliknite da izmenite ili da pregledate detalje statusa zadatka"
 
 #: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
-msgstr "Mog_uÄnosti kod slanja"
+msgstr "Mog_uÄnosti slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
-#: ../widgets/misc/e-send-options.c:502
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2676
+#: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "Zadatak"
 
@@ -4469,10 +4454,8 @@ msgid "Task Details"
 msgstr "Detalji zadatka"
 
 #: ../calendar/gui/dialogs/task-editor.c:373
-#, fuzzy
-#| msgid "Print the list of tasks"
 msgid "Print this task"
-msgstr "Åtampaj spisak zadataka"
+msgstr "OdÅtampajte ovaj zadatak"
 
 #: ../calendar/gui/dialogs/task-page.c:343
 msgid "Task's start date is in the past"
@@ -4488,7 +4471,7 @@ msgstr "Zadatak nije moguÄe ureÄivati, poÅto je izabrani spisak samo za Äita
 
 #: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Zadatak nije moguÄe potpuno urediti, poÅto niste organizator"
+msgstr "Zadatak nije moguÄe potpuno urediti, zato Åto niste organizator"
 
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
@@ -4497,12 +4480,12 @@ msgstr "Organi_zator:"
 
 #: ../calendar/gui/dialogs/task-page.c:880
 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:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Nije moguÄe otvaranje zadatka u â%sâ."
+msgstr "Ne mogu da otvorim zadatak u â%sâ."
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -4545,49 +4528,49 @@ msgstr "IzvrÅiÄe se nepoznata radnja"
 #: ../calendar/gui/e-alarm-list.c:476
 #, 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:481
 #, 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:488
 #, 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:499
 #, 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:504
 #, 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:511
 #, 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:535
 #, 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
@@ -4596,7 +4579,7 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretaÄa"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "Neimenovano"
 
@@ -4616,7 +4599,7 @@ msgstr "Datum poÄetka:"
 
 #: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
-msgstr "Datum za zavrÅetak:"
+msgstr "Krajnji rok:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
@@ -4654,7 +4637,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
@@ -4692,54 +4675,54 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-cal-model.c:537 ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:967 ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1281
 msgid "Recurring"
 msgstr "Ponovno"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1283
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2236
 #, 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"
@@ -4751,7 +4734,7 @@ 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
@@ -4767,94 +4750,94 @@ msgstr "Datum poÄetka"
 #: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:572
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "Tip"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "SeÄe izabrane dogaÄaje u spisak iseÄaka"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "UmnoÅava izabrane dogaÄaje u spisak iseÄaka"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Ubacuje dogaÄaje iz spiska iseÄaka"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "BriÅe izabrane dogaÄaje"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-calendar-view.c:448 ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
-msgstr "Brisanje izabranih objekata"
+msgstr "BriÅem izabrane objekte"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:642 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
-msgstr "AÅuriranje objekata"
+msgstr "AÅuriram objekat"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1724
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Accepted"
 msgstr "PrihvaÄeno"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1725
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2337
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1726
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1727
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2340
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1876 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1892 ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:1923
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -4910,8 +4893,8 @@ msgstr "PrikaÅi drugu vremensku zonu"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1892
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4926,7 +4909,7 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1909
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
@@ -4942,7 +4925,7 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1925
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../modules/calendar/e-cal-shell-view-private.c:1050
@@ -4950,25 +4933,24 @@ msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089 ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 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:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092 ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 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:2645
+#: ../calendar/gui/e-day-view.c:2676
 #, c-format
 msgid "Week %d"
-msgstr "%d. nedelja"
+msgstr "%d nedelja"
 
 #: ../calendar/gui/e-itip-control.c:761
-#| msgid "Recurring"
 msgid "Recurring:"
 msgstr "Ponovno:"
 
@@ -4980,7 +4962,7 @@ msgstr "Da. (SloÅeno ponavljanje)"
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] "Svaki %d dan"
+msgstr[0] "Svakog %d dana"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
 msgstr[3] "Svaki dan"
@@ -5069,12 +5051,12 @@ msgstr "Rok"
 
 #: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
-msgstr "iKalendar podaci"
+msgstr "Podaci iKalendara"
 
 #. Title
 #: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
-msgstr "iKalendar greÅka"
+msgstr "GreÅka iKalendara"
 
 #: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
 #: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
@@ -5087,15 +5069,10 @@ msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #: ../calendar/gui/e-itip-control.c:1145
-#, fuzzy
-#| msgid ""
-#| "<br> Please review the following information, and then select an action "
-#| "from the menu below."
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
-msgstr ""
-"<br> Proverite sledeÄi podatak i potom izaberite radnju iz donjeg menija."
+msgstr "Proverite sledeÄi podatak i potom izaberite radnju iz donjeg izbornika."
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -5104,13 +5081,13 @@ msgstr ""
 # is not permitted.
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2318
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NiÅta"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄeno s rezervom"
 
@@ -5118,35 +5095,31 @@ msgstr "PrihvaÄeno s rezervom"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr "Sastanak je otkazan, meÄutim nije ga moguÄe naÄi u VaÅim kalendarima"
+msgstr "Sastanak je otkazan, stoga se neÄe nalaziti u vaÅim kalendarima."
 
 #: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Zadatak je otkazan, meÄutim nije ga moguÄe naÄi u VaÅim spiskovima zadataka"
+msgstr "Zadatak je otkazan, stoga se neÄe nalaziti u vaÅoj listi zadataka"
 
 #: ../calendar/gui/e-itip-control.c:1369
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published meeting information."
+#, c-format
 msgid "%s has published meeting information."
-msgstr "<b>%s</b> objavljuje podatak o sastanku."
+msgstr "%s je objavio podatak o sastanku."
 
 #: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Podatak o sastanku"
 
 #: ../calendar/gui/e-itip-control.c:1376
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+#, c-format
 msgid "%s requests the presence of %s at a meeting."
-msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
+msgstr "%s zahteva prisustvo %s na sastanku."
 
 #: ../calendar/gui/e-itip-control.c:1378
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests your presence at a meeting."
+#, c-format
 msgid "%s requests your presence at a meeting."
-msgstr "<b>%s</b> zahteva VaÅe prisustvo na sastanku."
+msgstr "%s zahteva vaÅe prisustvo na sastanku."
 
 #: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
@@ -5154,40 +5127,36 @@ msgstr "Predlog za sastanak"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1385
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+#, c-format
 msgid "%s wishes to be added to an existing meeting."
-msgstr "<b>%s</b> Åeli da bude deo postojeÄeg sastanka."
+msgstr "%s Åeli da bude dodat postojeÄem sastanku."
 
 #: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "AÅuriranje sastanka"
 
 #: ../calendar/gui/e-itip-control.c:1390
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+#, c-format
 msgid "%s wishes to receive the latest meeting information."
-msgstr "<b>%s</b> Åeli da dobije najnovija obaveÅtenja o sastanku."
+msgstr "%s Åeli da dobije najnovija obaveÅtenja o sastanku."
 
 #: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Zahtev za aÅuriranjem sastanka"
 
 #: ../calendar/gui/e-itip-control.c:1398
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has replied to a meeting request."
+#, c-format
 msgid "%s has replied to a meeting request."
-msgstr "<b>%s</b> odgovara na zahtev za sastanak."
+msgstr "%s je odgovorio na zahtev za sastanak."
 
 #: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
 #: ../calendar/gui/e-itip-control.c:1406
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled a meeting."
+#, c-format
 msgid "%s has canceled a meeting."
-msgstr "<b>%s</b> otkazuje sastanak."
+msgstr "%s je otkazao sastanak."
 
 #: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
@@ -5195,36 +5164,32 @@ msgstr "Otkazivanje sastanka"
 
 #: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
 #: ../calendar/gui/e-itip-control.c:1534
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has sent an unintelligible message."
+#, c-format
 msgid "%s has sent an unintelligible message."
-msgstr "<b>%s</b> Åalje nerazumljivu poruku."
+msgstr "%s je poslao nerazumljivu poruku."
 
 #: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "LoÅa poruka o sastanku"
 
 #: ../calendar/gui/e-itip-control.c:1445
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published task information."
+#, c-format
 msgid "%s has published task information."
-msgstr "<b>%s</b> objavljuje podatak o zadatku."
+msgstr "%s je objavio podatak o zadatku."
 
 #: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Podatak o zadatku"
 
 #: ../calendar/gui/e-itip-control.c:1453
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests %s to perform a task."
+#, c-format
 msgid "%s requests %s to perform a task."
-msgstr "<b>%s</b> traÅi %s za izvrÅavanje zadatka."
+msgstr "%s traÅi %s da izvrÅi zadatak."
 
 #: ../calendar/gui/e-itip-control.c:1455
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests you perform a task."
+#, c-format
 msgid "%s requests you perform a task."
-msgstr "<b>%s</b> traÅi da Vi izvrÅite zadatak."
+msgstr "%s traÅi da vi izvrÅite zadatak."
 
 #: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
@@ -5232,40 +5197,36 @@ msgstr "Predlog za zadatak"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1462
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing task."
+#, c-format
 msgid "%s wishes to be added to an existing task."
-msgstr "<b>%s</b Åeli da bude deo postojeÄeg zadatka."
+msgstr "%s Åeli da bude dodat postojeÄem zadatku."
 
 #: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "AÅuriranje zadatka"
 
 #: ../calendar/gui/e-itip-control.c:1467
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to receive the latest task information."
+#, c-format
 msgid "%s wishes to receive the latest task information."
-msgstr "<b>%s</b> Åeli da prima najnovija obaveÅtenja o zadatku."
+msgstr "%s Åeli da dobije najnovija obaveÅtenja o zadatku."
 
 #: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Zahtev za aÅuriranjem zadatka"
 
 #: ../calendar/gui/e-itip-control.c:1475
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has replied to a task assignment."
+#, c-format
 msgid "%s has replied to a task assignment."
-msgstr "<b>%s</b> odgovara na dodeljen zadatak."
+msgstr "%s odgovara na dodeljen zadatak."
 
 #: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
 #: ../calendar/gui/e-itip-control.c:1483
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled a task."
+#, c-format
 msgid "%s has canceled a task."
-msgstr "<b>%s</b> otkazuje zadatak."
+msgstr "%s otkazuje zadatak."
 
 #: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
@@ -5276,38 +5237,35 @@ msgid "Bad Task Message"
 msgstr "LoÅa poruka o zadatku"
 
 #: ../calendar/gui/e-itip-control.c:1519
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published free/busy information."
+#, c-format
 msgid "%s has published free/busy information."
-msgstr "<b>%s</b> objavljuje slobodno/zauzeto vreme."
+msgstr "%s objavljuje slobodno/zauzeto vreme."
 
 #: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
-msgstr "Slobodno/zauzeto vreme"
+msgstr "Vreme slobodno/zauzeto"
 
 #: ../calendar/gui/e-itip-control.c:1524
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests your free/busy information."
+#, c-format
 msgid "%s requests your free/busy information."
-msgstr "<b>%s</b> pita kada ste slobodni/zauzeti."
+msgstr "%s pita kada ste slobodni/zauzeti."
 
 #: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
-msgstr "Slobodno/zauzeto zahtev"
+msgstr "Zahtev slobodno/zauzeto"
 
 #: ../calendar/gui/e-itip-control.c:1529
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has replied to a free/busy request."
+#, c-format
 msgid "%s has replied to a free/busy request."
-msgstr "<b>%s</b> odgovara na slobodno/zauzeto zahtev."
+msgstr "%s odgovara na zahtev slobodno/zauzeto."
 
 #: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
-msgstr "Slobodno/zauzeto odgovor"
+msgstr "Odgovor slobodno/zauzeto"
 
 #: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
-msgstr "LoÅa slobodno/zauzeto poruka"
+msgstr "LoÅa poruka slobodno/zauzeto"
 
 #: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
@@ -5319,15 +5277,15 @@ msgstr "Poruka sadrÅi samo nepodrÅane zahteve."
 
 #: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
-msgstr "Prilog ne sadrÅi ispravnu poruku za kalendar"
+msgstr "Prilog ne sadrÅi ispravnu poruku kalendara"
 
 #: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
-msgstr "Prilog nema stavke kalendara koji se mogu pregledati"
+msgstr "Prilog nema stavke kalendara koje se mogu pregledati"
 
 #: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
-msgstr "AÅuriranje zavrÅeno\n"
+msgstr "AÅuriranje je zavrÅeno\n"
 
 #: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
@@ -5335,7 +5293,7 @@ msgstr "Objekat nije ispravan i ne moÅe biti aÅuriran\n"
 
 #: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Ovaj odgovor nije poslao prisutan uÄesnik.  Dodati ga u prisutne?"
+msgstr "Ovaj odgovor nije poslao prisutan uÄesnik.  Da ga dodam u prisutne?"
 
 #: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -5343,16 +5301,16 @@ msgstr "Status uÄesnika nije aÅuriran jer nema ispravan status!\n"
 
 #: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
-msgstr "AÅuriran status uÄesnika\n"
+msgstr "Status uÄesnika je aÅuriran\n"
 
 #: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1423
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status uÄesnika nije osveÅen jer stavka viÅe ne postoji"
 
 #: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
-msgstr "Stavka poslata!\n"
+msgstr "Stavka je poslata!\n"
 
 #: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
@@ -5367,7 +5325,7 @@ msgstr "Izaberite radnju:"
 #: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
-msgstr "RSVP"
+msgstr "Molim odgovorite"
 
 #: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
@@ -5389,7 +5347,7 @@ msgstr "Odbij"
 
 #: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
-msgstr "PoÅalji slobodno/zauzeto podatak"
+msgstr "PoÅalji podatak slobodno/zauzeto"
 
 #: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
@@ -5400,8 +5358,8 @@ msgid "Send Latest Information"
 msgstr "PoÅalji najnoviji podatak"
 
 #: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:976
-#: ../widgets/misc/e-activity-proxy.c:298
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:300
 msgid "Cancel"
 msgstr "OtkaÅi"
 
@@ -5423,7 +5381,7 @@ msgstr "UÄitavanje kalendara"
 
 #: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
-msgstr "UÄitavanje kalendara..."
+msgstr "UÄitavam kalendar..."
 
 #: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
@@ -5451,49 +5409,49 @@ msgstr "Izvori"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "Pojedinac"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1010 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupa"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "Izvor"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "Soba"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "Stolica"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "Obavezan uÄesnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "MoguÄi uÄesnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "Ne-uÄesnik"
 
@@ -5629,7 +5587,7 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Älan"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:414
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5638,44 +5596,44 @@ msgstr "Älan"
 msgid "Memos"
 msgstr "BeleÅke"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* Bez saÅetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "PoÄetak:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
-msgstr "Do: "
+msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:712
 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:716
+#: ../calendar/gui/e-memo-table.c:718
 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:722
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleÅke iz spiska iseÄaka"
 
-#: ../calendar/gui/e-memo-table.c:728
+#: ../calendar/gui/e-memo-table.c:730
 #: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
-msgstr "ObriÅi izabrane beleÅke"
+msgstr "BriÅe izabrane beleÅke"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:736
 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
@@ -5686,18 +5644,17 @@ msgstr "Pritisnite da dodate beleÅku"
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
 #: ../calendar/gui/e-task-table.c:539
-#, fuzzy, c-format
-#| msgid "%d %b"
+#, c-format
 msgid "%d%%"
-msgstr "%d. %b"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:440
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5705,37 +5662,37 @@ msgstr "%d. %b"
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:933
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "SeÄe izabrane zadatke u spisak iseÄaka"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "UmnoÅava izabrane zadatke u spisak iseÄaka"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:947
 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:951
+#: ../calendar/gui/e-task-table.c:953
 #: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
-msgstr "ObriÅi izabrane zadatke"
+msgstr "BriÅe izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:959
 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.
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5766,7 +5723,7 @@ msgstr "dogaÄaj pregleda kalendara"
 
 #: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
-msgstr "Uhvati fokus"
+msgstr "Fokusiraj"
 
 #: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
@@ -5889,7 +5846,7 @@ 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:2287
+#: ../calendar/gui/gnome-cal.c:2310
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -5961,11 +5918,11 @@ msgstr "Najmanje jedan uÄesnik je neophodan"
 
 #: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
-msgstr "Podatak o dogaÄaju"
+msgstr "Podaci o dogaÄaju"
 
 #: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
-msgstr "Podatak o zadatku"
+msgstr "Podaci o zadatku"
 
 #: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
@@ -5973,11 +5930,11 @@ msgstr "Podaci o beleÅci"
 
 #: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
-msgstr "Slobodno/zauzeto podatak"
+msgstr "Podaci slobodno/zauzeto"
 
 #: ../calendar/gui/itip-utils.c:644
 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.
@@ -6053,250 +6010,250 @@ msgstr "Protiv-predlog"
 #: ../calendar/gui/itip-utils.c:803
 #, 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:811
 msgid "iCalendar information"
-msgstr "iKalendar podatak"
+msgstr "Podaci iKalendara"
 
 #: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr "Nije moguÄe saÄuvati unos, novi dogaÄaj se kosi sa nekim drugim."
+msgstr "Ne mogu da saÄuvam unos, novi dogaÄaj se sukobljava sa nekim drugim."
 
 #: ../calendar/gui/itip-utils.c:833
 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:986
 msgid "You must be an attendee of the event."
 msgstr "Morate biti uÄesnik dogaÄaja."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "Äe"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:2513
 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:2437
+#: ../calendar/gui/print.c:2521
 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:2441
+#: ../calendar/gui/print.c:2525
 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:2449
+#: ../calendar/gui/print.c:2533
 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:2454
+#: ../calendar/gui/print.c:2538
 msgid "Due "
-msgstr "Do "
+msgstr "Rok "
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "SaÅetak: %s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "Prisutni:"
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "VaÅnost: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak zavrÅenog: %i"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:2836
 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:15
 msgid "In progress"
@@ -6316,119 +6273,102 @@ msgstr "Zakazivanje i sastanci"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1837
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
 #: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
-msgstr "iKalendar datoteke (.ics)"
+msgstr "Datoteke iKalendara (.ics)"
 
 #: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
-msgstr "Evolucija iKalendar uvoznik"
+msgstr "Uvoznik iKalendara Evolucije"
 
 #: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
 #: ../calendar/importers/icalendar-importer.c:662
-#, fuzzy
-#| msgid "vCalendar files (.vcf)"
 msgid "vCalendar files (.vcs)"
-msgstr "vKalendar datoteke (.vcf)"
+msgstr "Datoteke vKalendara (.vcs)"
 
 #: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
-msgstr "Evolucija vKalendar uvoznik"
+msgstr "Uvoznik vKalendara Evolucije"
 
 #: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
-msgstr "Kalendarski dogaÄaji"
+msgstr "DogaÄaji kalendara"
 
 #: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
-msgstr "Evolucija kalendar inteligentni uvoznik"
+msgstr "Inteligentni uvoznik kalendara Evolucije"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1243
-#| msgctxt "New"
-#| msgid "M_eeting"
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1243
-#| msgid "Events"
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "DogaÄaj"
 
 #: ../calendar/importers/icalendar-importer.c:929
 #: ../calendar/importers/icalendar-importer.c:1244
-#| msgid "Task"
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
 #: ../calendar/importers/icalendar-importer.c:932
 #: ../calendar/importers/icalendar-importer.c:1245
-#| msgid "Memo"
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "BeleÅka"
 
 #: ../calendar/importers/icalendar-importer.c:941
-#| msgid "It has recurrences."
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
 #: ../calendar/importers/icalendar-importer.c:946
-#, fuzzy
-#| msgid "This and Prior Instances"
 msgctxt "iCalImp"
 msgid "is an instance"
-msgstr "Ovaj i prethodne unose"
+msgstr "je primerak"
 
 #: ../calendar/importers/icalendar-importer.c:951
-#| msgid "It has alarms."
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "ima alarme"
 
 #: ../calendar/importers/icalendar-importer.c:956
-#, fuzzy
-#| msgid "%s attachment"
 msgctxt "iCalImp"
 msgid "has attachments"
-msgstr "%s prilog"
+msgstr "ima priloge"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:969
-#| msgid "Public"
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:972
-#| msgid "Private"
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "LiÄno"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:975
-#| msgid "Confidential"
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
 #: ../calendar/importers/icalendar-importer.c:979
-#| msgid "Classification"
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
@@ -6437,14 +6377,12 @@ msgstr "Razvrstavanje"
 #. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:984
 #: ../calendar/importers/icalendar-importer.c:1284
-#| msgid "Summary"
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "SaÅetak"
 
 #. Translators: Appointment's location
 #: ../calendar/importers/icalendar-importer.c:990
-#| msgid "Location"
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
@@ -6453,29 +6391,24 @@ msgstr "Mesto"
 #. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:998
 #: ../calendar/importers/icalendar-importer.c:1280
-#| msgid "Start"
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "PoÄetak"
 
 #. Translators: 'Due' like the time due a task should be finished
 #: ../calendar/importers/icalendar-importer.c:1009
-#, fuzzy
-#| msgid "Due"
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
 #: ../calendar/importers/icalendar-importer.c:1021
-#| msgid "End"
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
 #: ../calendar/importers/icalendar-importer.c:1031
-#| msgid "Categories"
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorije"
@@ -6483,14 +6416,12 @@ msgstr "Kategorije"
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
 #: ../calendar/importers/icalendar-importer.c:1055
-#| msgid "Completed"
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ZavrÅeno"
 
 #. Translators: Appointment's URL
 #: ../calendar/importers/icalendar-importer.c:1063
-#| msgid "URL"
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
@@ -6498,7 +6429,6 @@ msgstr "Adresa"
 #. Translators: Appointment's organizer
 #: ../calendar/importers/icalendar-importer.c:1074
 #: ../calendar/importers/icalendar-importer.c:1077
-#| msgid "Organizer"
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
@@ -6506,20 +6436,17 @@ msgstr "Organizator"
 #. Translators: Appointment's attendees
 #: ../calendar/importers/icalendar-importer.c:1097
 #: ../calendar/importers/icalendar-importer.c:1100
-#| msgid "Attendees"
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "UÄesnici"
 
 #: ../calendar/importers/icalendar-importer.c:1114
-#| msgid "Description"
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
 #: ../calendar/importers/icalendar-importer.c:1276
-#| msgid "Type"
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tip"
@@ -6676,7 +6603,7 @@ msgstr "Afrika/Libervil"
 
 #: ../calendar/zones.h:57
 msgid "Africa/Lome"
-msgstr "Afrika/Lomi"
+msgstr "Afrika/Lome"
 
 #: ../calendar/zones.h:58
 msgid "Africa/Luanda"
@@ -6708,7 +6635,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"
@@ -6716,7 +6643,7 @@ msgstr "Afrika/Monrovija"
 
 #: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
-msgstr "Afrika/Nairobi"
+msgstr "Afrika/Najrobi"
 
 #: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
@@ -6732,7 +6659,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"
@@ -6756,7 +6683,7 @@ msgstr "Afrika/Tunis"
 
 #: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
-msgstr "Afrika/Vindek"
+msgstr "Afrika/Vindoek"
 
 #: ../calendar/zones.h:78
 msgid "America/Adak"
@@ -6784,7 +6711,7 @@ msgstr "Amerika/Aruba"
 
 #: ../calendar/zones.h:84
 msgid "America/Asuncion"
-msgstr "Amerika/Asankon"
+msgstr "Amerika/Asansjon"
 
 #: ../calendar/zones.h:85
 msgid "America/Barbados"
@@ -6808,7 +6735,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"
@@ -6844,7 +6771,7 @@ msgstr "Amerika/Äikago"
 
 #: ../calendar/zones.h:99
 msgid "America/Chihuahua"
-msgstr "Amerika/Äihuahua"
+msgstr "Amerika/Äiuaua"
 
 #: ../calendar/zones.h:100
 msgid "America/Cordoba"
@@ -6856,7 +6783,7 @@ msgstr "Amerika/Kostarika"
 
 #: ../calendar/zones.h:102
 msgid "America/Cuiaba"
-msgstr "Amerika/Kulaba"
+msgstr "Amerika/Kujaba"
 
 #: ../calendar/zones.h:103
 msgid "America/Curacao"
@@ -6924,7 +6851,7 @@ msgstr "Amerika/Grenada"
 
 #: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
-msgstr "Amerika/Gvadalup"
+msgstr "Amerika/Gvadalupa"
 
 #: ../calendar/zones.h:120
 msgid "America/Guatemala"
@@ -7869,7 +7796,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"
@@ -7917,7 +7844,7 @@ msgstr "Indijski/Majot"
 
 #: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "Indijski/Rejunion"
+msgstr "Indijski/Riunion"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Apia"
@@ -8079,141 +8006,141 @@ msgstr "Pacifik/Jap"
 msgid "Save as..."
 msgstr "SaÄuvaj kao..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:374
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Attach a file"
-msgstr "PrilaÅe datoteku"
+msgstr "PriloÅite datoteku"
 
-#: ../composer/e-composer-actions.c:247
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "Zatvorite trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:254
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "Åtam_paj..."
 
-#: ../composer/e-composer-actions.c:261
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "Pre_gled pred Åtampu"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
-msgstr "Äuva trenutnu datoteku"
+msgstr "SaÄuvajte trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "SaÄuvaj _kao..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:280
 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:282
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "SaÄuvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
-msgstr "Äuva kao nacrt"
+msgstr "SaÄuvajte kao nacrt"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "PoÅ_alji"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
-msgstr "Åalje ovu poruku"
+msgstr "PoÅaljite ovu poruku"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
-msgstr "Otvara prozor za novu poruku"
+msgstr "Otvorite prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "PGP _Åifruj"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:327
 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:330
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "PGP _potpiÅi"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:335
 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:338
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "V_aÅnost poruke"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "Postavlja vaÅnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "T_raÅi povratnicu"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "Prima izveÅtaj o dostavi kada je poruka proÄitana"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _Åifruj"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:359
 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:362
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiÅi"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:367
 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:370
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:375
 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:378
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
-msgstr "Odgo_vor-za polje"
+msgstr "Polje Odgo_vor-za"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "SaÄuvaj nacrt"
 
@@ -8223,15 +8150,15 @@ msgstr "Unesite primaoce poruke"
 
 #: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Unesite adrese koje Äe primiti kopiju (cc) poruke"
+msgstr "Unesite adrese koje Äe primiti grafitnu kopiju (cc) poruke"
 
 #: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"Unesite adrese koje Äe primiti kopiju poruke bez pojavljivanja u listi "
-"primalaca poruke"
+"Unesite adrese koje Äe primiti grafitnu kopiju poruke bez pojavljivanja u "
+"listi primalaca poruke"
 
 #: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
@@ -8251,15 +8178,15 @@ msgstr "_Prima:"
 
 #: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
-msgstr "_Kopija (Cc):"
+msgstr "_Cc:"
 
 #: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
-msgstr "_Nevidljiva kopija (Bcc):"
+msgstr "_Bcc:"
 
 #: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
-msgstr "S_lanje na:"
+msgstr "Objavi _na:"
 
 #: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
@@ -8269,75 +8196,66 @@ msgstr "Na_slov:"
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar."
 
-#: ../composer/e-composer-post-header.c:126
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "Opoziva poslednju radnju"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "Ponovo vrÅi opozvanu radnju"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "PretraÅuje tekst"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "PretraÅuje i zamenjuje tekst"
 
-#: ../composer/e-composer-private.c:313
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
-msgstr "SaÄuvaj nacrt"
+msgstr "SaÄuvajte nacrt"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:199
+#: ../composer/e-msg-composer.c:197
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../composer/e-msg-composer.c:1029
+#: ../composer/e-msg-composer.c:1030
 #, 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:1041
+#: ../composer/e-msg-composer.c:1042
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"Nije moguÄe Åifrovanje odlazeÄe poruke: nije postavljen sertifikat za "
-"Åifrovanje za ovaj nalog"
-
-#: ../composer/e-msg-composer.c:1465
-msgid "Unable to reconstruct message from autosave file"
-msgstr "Nije moguÄe povratiti poruku iz automatskog Äuvanja"
+"Nije moguÄe Åifrovanje odlazeÄe poruke: nije postavljeno uverenje za Åifrovanje "
+"za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
+#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1809
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:3538
-#, fuzzy
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
+#: ../composer/e-msg-composer.c:3475
 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:4144
+#: ../composer/e-msg-composer.c:4083
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
@@ -8357,11 +8275,11 @@ msgstr "Svi nalozi su uklonjeni."
 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:4
 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
@@ -8370,7 +8288,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:5
 msgid "Because &quot;{1}&quot;."
-msgstr "Zbog &quot;{1}&quot;."
+msgstr "Zbog â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -8378,42 +8296,42 @@ 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."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
-msgstr "Nije moguÄe napraviti prozor za sastavljanje."
+msgstr "Ne mogu da napravim prozor za sastavljanje."
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr "Nije moguÄe pravljenje poruke."
+msgstr "Ne mogu da napravim poruku."
 
 #: ../composer/mail-composer.error.xml.h:9
 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:10
 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:11
 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:12
 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:13
 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:14
 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:15
 msgid ""
@@ -8424,11 +8342,8 @@ msgstr ""
 "Äe omoguÄiti da nastavite gde ste stali."
 
 #: ../composer/mail-composer.error.xml.h:16
-#, 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:17
 msgid ""
@@ -8437,19 +8352,18 @@ msgid ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 msgstr ""
-"Nije moguÄe pokretanje kontrole HTML ureÄivaÄa.\n"
+"Ne mogu da pokrenem kontrolu HTML ureÄivaÄa.\n"
 "\n"
-"Proverite da li imate odgovarajuÄe verzije gtkhtml i libgtkhtml na sistemu."
+"Proverite da li imate odgovarajuÄe verzije âgtkhtmlâ i âlibgtkhtmlâ na "
+"sistemu."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
-msgstr "Nije moguÄe pokretanje kontrole biranja adresa."
+msgstr "Ne mogu da pokrenem kontrolu biranja adrese."
 
 #: ../composer/mail-composer.error.xml.h:21
-#, fuzzy
-#| msgid "You cannot attach the file `{0}' to this message."
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "Ne moÅete priloÅiti datoteku â{0}â ovoj poruci."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Ne moÅete priloÅiti datoteku â{0}â ovoj poruci."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8471,30 +8385,30 @@ msgstr "Spa_si"
 msgid "_Save Draft"
 msgstr "_SaÄuvaj nacrt"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "Pokreni Anjal u prozoru"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "OznaÄava Anjal za podrazumevanog klijenta poÅte"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
-msgstr "IB soketa za umetanje"
+msgstr "IB prikljuÄka za umetanje"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
-msgstr "soket"
+msgstr "prikljuÄak"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
-msgstr "Klijent poÅte Anjal"
+msgstr "Anjal klijent poÅte"
 
 #: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
-msgstr "Unesite VaÅe puno ime."
+msgstr "Unesite vaÅe puno ime."
 
 #: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
@@ -8505,26 +8419,24 @@ msgid "The email address you have entered is invalid."
 msgstr "Uneta adresa e-poÅte nije ispravna."
 
 #: ../capplet/settings/mail-account-view.c:77
-#| msgid "Please enter your email address."
 msgid "Please enter your password."
 msgstr "Unesite vaÅu lozinku."
 
 #: ../capplet/settings/mail-account-view.c:256
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
-msgstr "CalDAV"
+msgstr "KolDAV"
 
 #: ../capplet/settings/mail-account-view.c:360
 #: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
-msgstr "Google"
+msgstr "Gugl"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
 #: ../capplet/settings/mail-account-view.c:464
-#| msgid "Personal"
 msgid "Personal details:"
 msgstr "LiÄni podaci:"
 
@@ -8537,220 +8449,204 @@ msgid "Email address:"
 msgstr "Adresa e-poÅte:"
 
 #: ../capplet/settings/mail-account-view.c:490
-#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalji:</span>"
+msgid "Details:"
+msgstr "Detalji:"
 
-#: ../capplet/settings/mail-account-view.c:496
-#| msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Primanje:</span>"
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "Primanje"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "Tip servera: "
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "KorisniÄkoime:"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "Koristi Åifrovanje:"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "nikada"
 
-#: ../capplet/settings/mail-account-view.c:545
-#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Slanje:</span>"
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "Slanje"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:591
 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:587
+#: ../capplet/settings/mail-account-view.c:593
 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:589
+#: ../capplet/settings/mail-account-view.c:595
 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:591
+#: ../capplet/settings/mail-account-view.c:597
 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:592
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "MoÅete odrediti podrazumevane postavke naloga."
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:599
 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:608
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2228
 #: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
-msgstr "Napred - Primanje poÅte"
+msgstr "Napred â Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
-msgstr "Napred - Slanje poÅte"
+msgstr "Napred â Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
-msgstr "Nazad - Identitet"
+msgstr "Nazad â Identitet"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
-msgstr "Napred - Opcije za primanje"
+msgstr "Napred â Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
-msgstr "Nazad - Primanje poÅte"
+msgstr "Nazad â Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
-msgstr "Napred - Pregled postavki naloga"
+msgstr "Napred â Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
-msgstr "Napred - Podrazumevano"
+msgstr "Napred â Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
-msgstr "Nazad - Opcije za primanje"
+msgstr "Nazad â Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:3003 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
-msgstr "Nazad - Slanje poÅte"
+msgstr "Nazad â Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "ZavrÅetak"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
-msgstr "Nazad - Slanje"
+msgstr "Nazad â Slanje"
 
-#: ../capplet/settings/mail-account-view.c:719
-#, fuzzy
-#| msgid "Add WebDAV contacts to Evolution."
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google contacts with Evolution"
-msgstr "Dodaje WebDAV kontakte u Evoluciju."
+msgstr "Podesite Gugl kontakte sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:720
-#, fuzzy
-#| msgid "Add Google Calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:727
 msgid "Setup Google calendar with Evolution"
-msgstr "Dodaje Google kalendare u Evoluciju."
+msgstr "Podesite Gugl kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:732
 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:733
-#, fuzzy
-#| msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">LiÄni podaci:</span>"
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "PodeÅavanja Gugl naloga:"
 
-#: ../capplet/settings/mail-account-view.c:757
-#, fuzzy
-#| msgid "Add weather calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:767
 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:761
+#: ../capplet/settings/mail-account-view.c:771
 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:768
-#, fuzzy
-#| msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Upravljanje naloga</span>"
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "PodeÅavanja Jahu naloga:"
 
-#: ../capplet/settings/mail-account-view.c:780
-#, fuzzy
-#| msgid "Choose calendar file"
+#: ../capplet/settings/mail-account-view.c:792
 msgid "Yahoo Calendar name:"
-msgstr "Izaberite datoteku kalendara"
+msgstr "Ime Jahu kalendara:"
 
-#: ../capplet/settings/mail-account-view.c:1023
-#| msgid "Pass_word:"
+#: ../capplet/settings/mail-account-view.c:1061
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-account-view.c:1129
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Zatvori jeziÄak"
 
-#: ../capplet/settings/mail-account-view.c:1101
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "Äarobnjak naloga"
 
@@ -8760,34 +8656,33 @@ 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:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:348 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:230 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
 #: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
 #: ../mail/message-list.c:1666
-#: ../modules/addressbook/e-book-shell-backend.c:95
-#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:135
 #: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-cal-shell-migrate.c:147
 #: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:105
 #: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:114
 msgid "On This Computer"
 msgstr "Na ovom raÄunaru"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "Izmeni"
+#, c-format
+msgid "Modify %s..."
+msgstr "Izmeni %s..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
-msgstr "Dodaj novi nalog"
+msgstr "Dodajte novi nalog"
 
 #: ../capplet/settings/mail-settings-view.c:184
-#| msgid "Account Management"
 msgid "Account management"
 msgstr "Upravljanje nalozima"
 
@@ -8797,31 +8692,31 @@ 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"
 msgstr "ObaveÅtenje alarma Evolucije"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:847
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 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: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"
@@ -8832,28 +8727,28 @@ msgid "Email Settings"
 msgstr "Postavke poÅte"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (otkazano)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (zavrÅeno)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s..."
 msgstr "%s..."
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr "%s (%d%% zavrÅeno)"
+msgstr "%s (%d%% je zavrÅeno)"
 
 #: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
@@ -8864,46 +8759,46 @@ msgid "Evolution Warning"
 msgstr "Upozorenje Evolucije"
 
 # bug(slobo): mogli su dati i bolji original, dobili su isto tako smislen prevod
-#: ../e-util/e-alert.c:649
+#: ../e-util/e-alert.c:659
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "UnutraÅnja greÅka, zahtevana je nepoznata greÅka â%sâ"
 
 #: ../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"
@@ -8911,7 +8806,7 @@ msgstr "Tajvanski"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
-msgstr "Turska"
+msgstr "Turski"
 
 #: ../e-util/e-charset.c:64
 msgid "Unicode"
@@ -8919,54 +8814,53 @@ 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:196
 #: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Sutra"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "JuÄe"
 
 #. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#: ../e-util/e-datetime-format.c:213
 #, c-format
-#| msgid "%d days from now"
 msgid "%d day from now"
 msgid_plural "%d days from now"
 msgstr[0] "Za %d dan"
@@ -8974,23 +8868,12 @@ msgstr[1] "Za %d dana"
 msgstr[2] "Za %d dana"
 msgstr[3] "Za %d dan"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, c-format
-#| msgid "%d days ago"
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Pre %d dan"
-msgstr[1] "Pre %d dana"
-msgstr[2] "Pre %d dana"
-msgstr[3] "Pre %d dan"
-
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:290 ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:309
 msgid "Use locale default"
-msgstr "Koristi podrazumevan lokalitet"
+msgstr "Koristi podrazumevani lokalitet"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:503
 msgid "Format:"
 msgstr "Format:"
 
@@ -9002,14 +8885,14 @@ msgstr "(Nepoznato ime datoteke)"
 #: ../e-util/e-file-utils.c:140
 #, 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:145
 #, c-format
 msgid "Writing \"%s\" to %s"
-msgstr "Upisivanje â%sâ u %s"
+msgstr "Upisujem â%sâ u %s"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
@@ -9074,18 +8957,18 @@ 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:731
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
@@ -9100,11 +8983,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?"
@@ -9120,127 +9003,128 @@ msgstr "_PrepiÅi"
 
 #: ../e-util/e-util.c:146
 msgid "Could not open the link."
-msgstr "Nije moguÄe otvoriti vezu."
+msgstr "Ne mogu da otvorim vezu."
 
 #: ../e-util/e-util.c:193
 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:1281
 #, c-format
 msgid "GConf error: %s"
-msgstr "GConf greÅka: %s"
+msgstr "Gkonf greÅka: %s"
 
 #: ../e-util/gconf-bridge.c:1292
 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:269 ../em-format/em-format.c:1024
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Åalje"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1025
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1027
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/em-format-html.c:2300 ../mail/em-format-html.c:2362
+#: ../mail/em-format-html.c:2385 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
-msgstr "Kopija (Cc)"
+msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1028
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2366
+#: ../mail/em-format-html.c:2388 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
-msgstr "Nevidljiva kopija (Bcc)"
+msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:406 ../em-format/em-format.c:1029
+#: ../em-format/em-format-quote.c:414 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Naslov"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:417 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/em-format-quote.c:425 ../mail/em-format-html.c:2482
+#: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "PoÅiljalac"
 
-#: ../em-format/em-format-quote.c:492 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:504 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ProsleÄena poruka --------"
 
-#: ../em-format/em-format.c:1030 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:1031 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
-msgstr "Grupe za vesti"
+msgstr "Grupe vesti"
 
-#: ../em-format/em-format.c:1032 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1046 ../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:1411
+#: ../em-format/em-format.c:1433
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../em-format/em-format.c:1472
+#: ../em-format/em-format.c:1522
 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:1627 ../em-format/em-format.c:1803
+#: ../em-format/em-format.c:1681 ../em-format/em-format.c:1866
 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:1635
+#: ../em-format/em-format.c:1691
 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:1648
+#: ../em-format/em-format.c:1708
 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:1649
+#: ../em-format/em-format.c:1709
 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:1827
+#: ../em-format/em-format.c:1891
 msgid "Unsupported signature format"
 msgstr "NepodrÅan oblik potpisa"
 
-#: ../em-format/em-format.c:1837 ../em-format/em-format.c:1997
+#: ../em-format/em-format.c:1901 ../em-format/em-format.c:2061
 msgid "Error verifying signature"
 msgstr "GreÅka pri proveri potpisa"
 
-#: ../em-format/em-format.c:1838 ../em-format/em-format.c:1985
-#: ../em-format/em-format.c:1998
+#: ../em-format/em-format.c:1902 ../em-format/em-format.c:2049
+#: ../em-format/em-format.c:2062
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greÅka pri proveri potpisa"
 
-#: ../em-format/em-format.c:2082
-#, fuzzy
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2149
 msgid "Could not parse PGP message: "
-msgstr "Nije moguÄa obrada PGP poruke."
+msgstr "Ne mogu da analiziram PGP poruku:"
 
-#: ../em-format/em-format.c:2088 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2155 ../mail/mail-ops.c:614
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "Nepoznata greÅka"
 
-#: ../filter/e-filter-datespec.c:74
+#. 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
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9249,7 +9133,7 @@ msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 msgstr[3] "pre %d sekunde"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9258,7 +9142,7 @@ msgstr[1] "%d sekunde u buduÄnosti"
 msgstr[2] "%d sekundi u buduÄnosti"
 msgstr[3] "%d sekunda u buduÄnosti"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9267,7 +9151,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9276,7 +9160,7 @@ msgstr[1] "%d minuta u buduÄnosti"
 msgstr[2] "%d minuta u buduÄnosti"
 msgstr[3] "%d minut u buduÄnosti"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9285,7 +9169,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9294,7 +9178,7 @@ msgstr[1] "%d sata u buduÄnosti"
 msgstr[2] "%d sati u buduÄnosti"
 msgstr[3] "%d sat u buduÄnosti"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9321,7 +9205,7 @@ msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 msgstr[3] "pre %d nedelju"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9330,7 +9214,7 @@ msgstr[1] "%d nedelje u buduÄnosti"
 msgstr[2] "%d nedelja u buduÄnosti"
 msgstr[3] "%d nedelja u buduÄnosti"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9339,16 +9223,16 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d mesec u buduÄnosti"
-msgstr[1] "%d months in the future"
-msgstr[2] "%d months in the future"
+msgstr[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:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -9357,7 +9241,7 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godinu"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -9366,100 +9250,111 @@ msgstr[1] "%d godine u buduÄnosti"
 msgstr[2] "%d godina u buduÄnosti"
 msgstr[3] "%d godina u buduÄnosti"
 
-#: ../filter/e-filter-datespec.c:119
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poreÄenje"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "Ime p_ravila:"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "PronaÄi stavke koje zadovoljavaju sledeÄe uslove"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "Dodaj _uslov"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "Ako su svi uslovi zadovoljeni"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "Ako je bilo koji uslov zadovoljen"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "_PronaÄi stavke:"
 
-#: ../filter/e-filter-rule.c:760
+# 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 not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:749
+msgid "None"
+msgstr "NiÅta"
+
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "Odgovori i nadreÄeno"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "U_kljuÄi niti"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "Dodaj _uslov"
+
+#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Odlazno"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 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."
@@ -9476,7 +9371,7 @@ 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."
@@ -9565,10 +9460,10 @@ msgstr "vreme koje odredite"
 msgid "years"
 msgstr "godine"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Prilog"
@@ -9576,38 +9471,37 @@ msgstr[1] "Prilozi"
 msgstr[2] "Prilozi"
 msgstr[3] "Prilog"
 
-#: ../mail/e-mail-attachment-bar.c:586
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
-msgstr "Pregled sa ikonama"
+msgstr "Pregled ikonicama"
 
-#: ../mail/e-mail-attachment-bar.c:587
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
-msgstr "Pregled sa spiskom"
+msgstr "Pregled spiskom"
 
-#: ../mail/e-mail-browser.c:265
-#| msgid "Subject"
+#: ../mail/e-mail-browser.c:267
 msgid "(No Subject)"
-msgstr ""
+msgstr "(Bez subjekta)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:67
 msgid "_Add to Address Book..."
 msgstr "_Dodaj u adresar..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:74
 msgid "_To This Address"
 msgstr "_Na ovu adresu"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:81
 msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:90
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "Naziv _oznake:"
 
@@ -9639,7 +9533,7 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:478
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "Dodaj oznaku"
 
@@ -9652,8 +9546,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:86
 msgid "Color"
@@ -9669,32 +9563,32 @@ msgid "Name"
 msgstr "Ime"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../mail/em-folder-tree-model.c:697 ../mail/em-folder-tree.c:2840
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "SanduÄe"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:689
 msgid "Drafts"
 msgstr "Nacrti"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:701
 msgid "Outbox"
 msgstr "Za slanje"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:703
 msgid "Sent"
 msgstr "Poslato"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:692
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:573
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "Åabloni"
 
 #: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
-msgstr "PrenoÅenje..."
+msgstr "Prenosim..."
 
 #: ../mail/e-mail-migrate.c:164
 msgid "Migration"
@@ -9703,7 +9597,7 @@ msgstr "Prelazak"
 #: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
-msgstr "PrenoÅenje â%sâ:"
+msgstr "Prenosim â%sâ:"
 
 #: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
@@ -9716,18 +9610,16 @@ 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:739
+#: ../mail/e-mail-migrate.c:796
 #, c-format
-#| msgid "Unable to create local mail folders at `%s': %s"
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Ne mogu da napravim lokalne fascikle za poÅtu u â%sâ: %s"
 
 #: ../mail/e-mail-notebook-view.c:563
-#| msgid "Please select a server."
 msgid "Please select a folder"
 msgstr "Izaberite fasciklu."
 
@@ -9739,34 +9631,33 @@ msgstr "Izaberite fasciklu."
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "UmnoÅi u fasciklu"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:410
 msgid "C_opy"
 msgstr "_UmnoÅi"
 
-#: ../mail/e-mail-reader.c:648 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/e-mail-reader.c:648 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:410
 msgid "_Move"
 msgstr "Pre_mesti"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:908 ../mail/e-mail-reader.c:1019
-#: ../mail/e-mail-reader.c:1060
-#| msgid "Do not ask me again"
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1065
+#: ../mail/e-mail-reader.c:1116
 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:1155
+#: ../mail/e-mail-reader.c:1206
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "SaÄuvaj poruku"
@@ -9780,7 +9671,7 @@ msgstr[3] "SaÄuvaj poruku"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1176
+#: ../mail/e-mail-reader.c:1227
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
@@ -9788,605 +9679,583 @@ msgstr[0] "Poruka"
 msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
-#: ../mail/e-mail-reader.c:1441
+
+#: ../mail/e-mail-reader.c:1492
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj poÅiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1443
+#: ../mail/e-mail-reader.c:1494
 msgid "Add sender to address book"
 msgstr "Dodaj poÅiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1499
 msgid "Check for _Junk"
-msgstr "Proveri ima li _Äubreta"
+msgstr "Proveri da li ima _Äubreta"
 
-#: ../mail/e-mail-reader.c:1450
+#: ../mail/e-mail-reader.c:1501
 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:1455
+#: ../mail/e-mail-reader.c:1506
 msgid "_Copy to Folder..."
 msgstr "_UmnoÅi u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1457
+#: ../mail/e-mail-reader.c:1508
 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:1462
+#: ../mail/e-mail-reader.c:1513
 msgid "_Delete Message"
 msgstr "_ObriÅi poruku"
 
-#: ../mail/e-mail-reader.c:1464
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages for deletion"
 msgstr "OznaÄava izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1520
 msgid "Filter on Mailing _List..."
 msgstr "Filter na dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1471
+#: ../mail/e-mail-reader.c:1522
 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:1476
+#: ../mail/e-mail-reader.c:1527
 msgid "Filter on _Recipients..."
 msgstr "Filter na _primaoce..."
 
-#: ../mail/e-mail-reader.c:1478
+#: ../mail/e-mail-reader.c:1529
 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:1483
+#: ../mail/e-mail-reader.c:1534
 msgid "Filter on Se_nder..."
 msgstr "Filter na poÅ_iljaoca..."
 
-#: ../mail/e-mail-reader.c:1485
+#: ../mail/e-mail-reader.c:1536
 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:1490
+#: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
 msgstr "Filter na _naslov..."
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1543
 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:1497
+#: ../mail/e-mail-reader.c:1548
 msgid "A_pply Filters"
 msgstr "Pri_meni filtere"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1550
 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:1504
+#: ../mail/e-mail-reader.c:1555
 msgid "_Find in Message..."
 msgstr "P_ronaÄi u poruci..."
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1557
 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:1511
+#: ../mail/e-mail-reader.c:1562
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1564
 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:1518
+#: ../mail/e-mail-reader.c:1569
 msgid "_Flag Completed"
 msgstr "OznaÄ_i kao zavrÅeno"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1571
 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:1525
+#: ../mail/e-mail-reader.c:1576
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1578
 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:1532
+#: ../mail/e-mail-reader.c:1583
 msgid "_Attached"
 msgstr "Pri_loÅeno"
 
-#: ../mail/e-mail-reader.c:1534 ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ProsleÄuje izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:1539
+#: ../mail/e-mail-reader.c:1590
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1597
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:1548 ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
 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:1553
+#: ../mail/e-mail-reader.c:1604
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1611
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1562 ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
 msgid "Forward the selected message quoted like a reply"
 msgstr "ProsleÄuje izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:1567
+#: ../mail/e-mail-reader.c:1618
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1625
 msgid "_Load Images"
 msgstr "_UÄitaj slike"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1627
 msgid "Force images in HTML mail to be loaded"
 msgstr "Silom uÄitava slike u HTML porukama"
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1632
 msgid "_Important"
 msgstr "_VaÅno"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1634
 msgid "Mark the selected messages as important"
 msgstr "OznaÄava izabranu(e) poruku(e) kao vaÅno"
 
-#: ../mail/e-mail-reader.c:1588
+#: ../mail/e-mail-reader.c:1639
 msgid "_Junk"
 msgstr "_Äubre"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1641
 msgid "Mark the selected messages as junk"
 msgstr "OznaÄava izabranu(e) poruku(e) kao neÅeljenu poÅtu"
 
-#: ../mail/e-mail-reader.c:1595
+#: ../mail/e-mail-reader.c:1646
 msgid "_Not Junk"
 msgstr "Ni_je Äubre"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1648
 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:1602
+#: ../mail/e-mail-reader.c:1653
 msgid "_Read"
 msgstr "Pro_Äitaj"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1655
 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:1609
+#: ../mail/e-mail-reader.c:1660
 msgid "Uni_mportant"
 msgstr "Ne_vaÅno"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1662
 msgid "Mark the selected messages as unimportant"
 msgstr "OznaÄava izabranu(e) poruku(e) kao nevaÅno"
 
-#: ../mail/e-mail-reader.c:1616
+#: ../mail/e-mail-reader.c:1667
 msgid "_Unread"
 msgstr "_NeproÄitano"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1669
 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:1623
+#: ../mail/e-mail-reader.c:1674
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1676
 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:1630
+#: ../mail/e-mail-reader.c:1681
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1683
 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:1637
+#: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1690
 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:1644
+#: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1697
 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:1651
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1702
 msgid "_Switch to Folder"
 msgstr "PreÄi u _fasciklu"
 
-#: ../mail/e-mail-reader.c:1653
-#, fuzzy
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:1704
 msgid "Display the parent folder"
-msgstr "Instaliraj deljenu fasciklu"
+msgstr "Prikazuje nadreÄenu fasciklu"
 
-#: ../mail/e-mail-reader.c:1658
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1709
 msgid "Switch to _next tab"
-msgstr "PreÄi na %s"
+msgstr "Prebaci na _sledeÄi jeziÄak"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1711
 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:1665
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1716
 msgid "Switch to _previous tab"
-msgstr "PreÄi na %s"
+msgstr "Prebaci na _prethodni jeziÄak"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1718
 msgid "Switch to the previous tab"
-msgstr "Prebaci na prethodni jeziÄak"
+msgstr "Prebacuje na prethodni jeziÄak"
 
-#: ../mail/e-mail-reader.c:1672
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:1723
 msgid "Cl_ose current tab"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "_Zatvori trenutni jeziÄak"
 
-#: ../mail/e-mail-reader.c:1674
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:1725
 msgid "Close current tab"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "Zatvara trenutni jeziÄak"
 
-#: ../mail/e-mail-reader.c:1679
+#: ../mail/e-mail-reader.c:1730
 msgid "_Next Message"
 msgstr "_SledeÄa poruka"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1732
 msgid "Display the next message"
-msgstr "PrikaÅi sledeÄu poruku"
+msgstr "Prikazuje sledeÄu poruku"
 
-#: ../mail/e-mail-reader.c:1686
+#: ../mail/e-mail-reader.c:1737
 msgid "Next _Important Message"
 msgstr "SledeÄa _vaÅna poruka"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1739
 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:1693
+#: ../mail/e-mail-reader.c:1744
 msgid "Next _Thread"
 msgstr "_SledeÄa rasprava"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1746
 msgid "Display the next thread"
-msgstr "PrikaÅi sledeÄu raspravu"
+msgstr "Prikazuje sledeÄu raspravu"
 
-#: ../mail/e-mail-reader.c:1700
+#: ../mail/e-mail-reader.c:1751
 msgid "Next _Unread Message"
 msgstr "SledeÄa _neproÄitana poruka"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1753
 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:1707
+#: ../mail/e-mail-reader.c:1758
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1760
 msgid "Display the previous message"
-msgstr "PrikaÅi prethodnu poruku"
+msgstr "Prikazuje prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:1714
+#: ../mail/e-mail-reader.c:1765
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna vaÅna poruka"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1767
 msgid "Display the previous important message"
-msgstr "PrikaÅi prethodnu vaÅnu poruku"
+msgstr "Prikazuje prethodnu vaÅnu poruku"
 
-#: ../mail/e-mail-reader.c:1721
+#: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
 msgstr "P_rethodna neproÄitana poruka"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
-msgstr "PrikaÅi prethodnu neproÄitanu poruku"
+msgstr "Prikazuje prethodnu neproÄitanu poruku"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1781
 msgid "Print this message"
 msgstr "Åtampaj ovu poruku"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1788
 msgid "Preview the message to be printed"
-msgstr "Pregledaj poruku pred Åtampu"
+msgstr "Pregleda poruku pred Åtampu"
 
-#: ../mail/e-mail-reader.c:1742
+#: ../mail/e-mail-reader.c:1793
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1795
 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:1749 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:139
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1802
 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:1756 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1809
 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:1763
-#: ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "_Odgovori poÅiljaocu"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1816
 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:1770
+#: ../mail/e-mail-reader.c:1821
 msgid "_Save as mbox..."
-msgstr "_SaÄuvaj kao mbox..."
+msgstr "_SaÄuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1823
 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:1777
+#: ../mail/e-mail-reader.c:1828
 msgid "Search Folder from Mailing _List..."
 msgstr "Fascikla pretrage na dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:1830
 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:1784
+#: ../mail/e-mail-reader.c:1835
 msgid "Search Folder from Recipien_ts..."
 msgstr "Fascikla pretrage od prima_laca..."
 
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1837
 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:1791
+#: ../mail/e-mail-reader.c:1842
 msgid "Search Folder from Sen_der..."
 msgstr "Fascikla pretrage na _poÅiljaoca..."
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1844
 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:1798
+#: ../mail/e-mail-reader.c:1849
 msgid "Search Folder from S_ubject..."
 msgstr "Fascikla pretrage na n_aslov..."
 
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1851
 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:1805
+#: ../mail/e-mail-reader.c:1856
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1858
 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:1819
+#: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1872
 msgid "Undelete the selected messages"
-msgstr "Povrati izabrane poruke"
+msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1877
 msgid "_Normal Size"
 msgstr "_Normalna veliÄina"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1879
 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:1833
+#: ../mail/e-mail-reader.c:1884
 msgid "_Zoom In"
 msgstr "Uv_eÄaj"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1886
 msgid "Increase the text size"
-msgstr "UveÄaj veliÄinu teksta"
+msgstr "UveÄajte veliÄinu teksta"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1891
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1893
 msgid "Decrease the text size"
-msgstr "Umanji veliÄinu teksta"
+msgstr "Umanjite veliÄinu teksta"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1900
 msgid "Create R_ule"
 msgstr "Napravi pra_vilo"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1907
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1914
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:1870
-#, fuzzy
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:1921
 msgid "_Group Reply"
-msgstr "O_dgovori"
+msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1928
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1935
 msgid "Mar_k As"
 msgstr "O_znaÄi kao"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1942
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1949
 msgid "_Zoom"
 msgstr "Uv_eÄaj"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1974
 msgid "Mark for Follo_w Up..."
 msgstr "ObeleÅi za _praÄenje..."
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1982
 msgid "Mark as _Important"
 msgstr "OnaÄi kao _vaÅno"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Junk"
 msgstr "OznaÄi kao _Äubre"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Not Junk"
 msgstr "OznaÄi da _nije Äubre"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1994
 msgid "Mar_k as Read"
 msgstr "O_znaÄi kao proÄitano"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark as Uni_mportant"
 msgstr "OznaÄi kao _nevaÅno"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as _Unread"
 msgstr "OznaÄi kao _neproÄitano"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2038
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:2040
 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:1995
+#: ../mail/e-mail-reader.c:2046
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2048
 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:2218
+#: ../mail/e-mail-reader.c:2269
 msgid "Unable to retrieve message"
-msgstr "Nije moguÄe dobiti poruku"
+msgstr "Ne mogu da dobavim poruku"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1896
 #, 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:2838 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2913 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../mail/e-mail-reader.c:3007
-#: ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:3061
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:3008
+#: ../mail/e-mail-reader.c:3062
 msgid "Forward the selected message to someone"
 msgstr "ProsleÄuje izabranu poruku nekome"
 
-#. Likewise the "mail-reply-group" action
-#. For Translators: "Group Reply" will reply either to a mailing list
-#. (if possible and if that configuration option is enabled), or else
-#. it will reply to all. The word "Group" was chosen because it covers
-#. either of those, without too strongly implying one or the other.
-#: ../mail/e-mail-reader.c:3026
-#, fuzzy
-#| msgid "Group Items By"
+#: ../mail/e-mail-reader.c:3081
 msgid "Group Reply"
-msgstr "GrupiÅi stavke po"
+msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:3027
-#, fuzzy
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3082
 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:3072 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3127 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "ObriÅi"
 
-#: ../mail/e-mail-reader.c:3104
+#: ../mail/e-mail-reader.c:3160
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../widgets/misc/e-calendar.c:193
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "SledeÄe"
 
-#: ../mail/e-mail-reader.c:3108
+#: ../mail/e-mail-reader.c:3164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
-#: ../widgets/misc/e-calendar.c:169
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:3118 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3174 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader.c:3730
-#, fuzzy, c-format
-#| msgid "Folder"
+#: ../mail/e-mail-reader.c:3742
+#, c-format
 msgid "Folder '%s'"
-msgstr "Fascikla"
+msgstr "Fascikla â%sâ"
 
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
@@ -10394,15 +10263,15 @@ 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:508 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:513 ../mail/mail-config.ui.h:77
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
-msgstr "Ne koristi se Åifrovanje"
+msgstr "Bez Åifrovanja"
 
 #. 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:512 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:517 ../mail/mail-config.ui.h:136
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS Åifrovanje"
@@ -10410,17 +10279,17 @@ 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:516 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:521 ../mail/mail-config.ui.h:105
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL Åifrovanje"
 
-#: ../mail/em-account-editor.c:603
+#: ../mail/em-account-editor.c:608
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ugovor o licenci"
 
-#: ../mail/em-account-editor.c:610
+#: ../mail/em-account-editor.c:615
 #, c-format
 msgid ""
 "\n"
@@ -10439,20 +10308,20 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:902 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../mail/em-account-editor.c:981
+#: ../mail/em-account-editor.c:986
 msgid "Never"
 msgstr "Nikada"
 
-#: ../mail/em-account-editor.c:982
+#: ../mail/em-account-editor.c:987
 msgid "Always"
 msgstr "Uvek"
 
-#: ../mail/em-account-editor.c:983
+#: ../mail/em-account-editor.c:988
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
@@ -10462,16 +10331,16 @@ msgstr "Pitaj za svaku poruku"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1726 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2104
 msgid "Mail Configuration"
 msgstr "PodeÅavanje poÅte"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10479,55 +10348,55 @@ msgid ""
 msgstr ""
 "Dobro doÅli u PomoÄnika podeÅavanja poÅte Evolucije.\n"
 "\n"
-"Kliknite âNapredâ za poÄetak. "
+"Kliknite âNapredâ da zapoÄnete. "
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2108
 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."
+"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:2101 ../mail/em-account-editor.c:2258
+#: ../mail/em-account-editor.c:2110 ../mail/em-account-editor.c:2267
 #: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "Primanje poÅte"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2111
 msgid "Please configure the following account settings."
 msgstr "Podesite sledeÄe postavke naloga."
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
+#: ../mail/em-account-editor.c:2113 ../mail/em-account-editor.c:2758
 msgid "Sending Email"
 msgstr "Slanje poÅte"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2114
 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."
+"pitajte administratora sistema ili dostavljaÄa Internet usluga."
 
-#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2116
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2117
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Unesite dole opisno ime za ovaj nalog.\n"
+"Unesite opisno ime za ovaj nalog.\n"
 "Ovo ime Äe biti koriÅÄeno samo za prikaz."
 
-#: ../mail/em-account-editor.c:2112
+#: ../mail/em-account-editor.c:2121
 msgid "Done"
-msgstr "Gotovo"
+msgstr "UraÄeno"
 
-#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2122
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10537,52 +10406,50 @@ msgid ""
 msgstr ""
 "Äestitamo, podeÅavanje poÅte je zavrÅeno.\n"
 "\n"
-"Sada ste spremni da Åaljete i primate poÅtu koriÅÄenjem Evolucije.\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:2554
+#: ../mail/em-account-editor.c:2572
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poÅtu svakih"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2562
+#: ../mail/em-account-editor.c:2580
 msgid "minu_tes"
 msgstr "minu_ta"
 
-#: ../mail/em-account-editor.c:2838
-#, fuzzy
-#| msgid "Please select an image for this contact"
+#: ../mail/em-account-editor.c:2856
 msgid "Please select a folder from the current account."
-msgstr "Izaberite sliku za ovaj kontakt"
+msgstr "Izaberite fasciklu iz tekuÄeg naloga."
 
-#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3126 ../mail/mail-config.ui.h:112
 msgid "Security"
-msgstr "Sigurnost"
+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:3153 ../mail/em-account-editor.c:3221
+#: ../mail/em-account-editor.c:3171 ../mail/em-account-editor.c:3239
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
+#: ../mail/em-account-editor.c:3172 ../mail/em-account-editor.c:3240
 msgid "Checking for New Messages"
 msgstr "Proveranje za nove poruke"
 
 #. 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:1539
+#: ../mail/em-composer-utils.c:1735
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "VaÅa poruka za %s na temu â%sâ na %s je proÄitana."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1587
+#: ../mail/em-composer-utils.c:1783
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ObaveÅtenje o prijemu za: â%sâ"
 
-#: ../mail/em-composer-utils.c:1991
+#: ../mail/em-composer-utils.c:2192
 msgid "an unknown sender"
 msgstr "nepoznati poÅiljalac"
 
@@ -10591,7 +10458,7 @@ msgstr "nepoznati poÅiljalac"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2038
+#: ../mail/em-composer-utils.c:2239
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10599,21 +10466,21 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piÅe:"
 
-#: ../mail/em-composer-utils.c:2182
+#: ../mail/em-composer-utils.c:2383
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2372
+#: ../mail/em-composer-utils.c:2595
 msgid "Posting destination"
 msgstr "OdrediÅna poÅta"
 
-#: ../mail/em-composer-utils.c:2373
+#: ../mail/em-composer-utils.c:2596
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
 #: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
-msgstr "Izaberite fasciklu"
+msgstr "Izaberi fasciklu"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10698,7 +10565,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"
@@ -10787,7 +10654,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"
@@ -10921,7 +10788,7 @@ msgstr "_Ime fascikle:"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
 
@@ -10930,101 +10797,82 @@ msgstr "Fascikle pretrage"
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
+#: ../mail/em-folder-tree-model.c:767 ../mail/em-folder-tree-model.c:1114
 msgid "Loading..."
-msgstr "UÄitavanje..."
+msgstr "UÄitavam..."
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:191
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Pretraga fascikli u â%sâ"
+msgstr "PretraÅujem fascikle u â%sâ"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:611
 msgid "Folder names cannot contain '/'"
-msgstr "Imena fascikli ne mogu da sadrÅe â/â"
-
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+msgstr "Imena fascikli ne mogu da sadrÅe â/â"
+
+#: ../mail/em-folder-tree.c:1100
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1339
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poÅtu"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1656 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
-msgstr "PremeÅtanje fascikle %s"
+msgstr "PremeÅtam fasciklu â%sâ"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1660 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
-msgstr "UmnoÅavanje fascikle %s"
+msgstr "UmnoÅavam fasciklu â%sâ"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1669 ../mail/message-list.c:2164
 #, 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:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1673 ../mail/message-list.c:2166
 #, 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:1650
+#: ../mail/em-folder-tree.c:1690
 #, 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-utils.c:403
+#: ../mail/em-folder-utils.c:411
 msgid "Move Folder To"
 msgstr "Premesti fasciklu u"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:411
 msgid "Copy Folder To"
 msgstr "UmnoÅi fasciklu u"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
-#, fuzzy, c-format
-#| msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:541
+#: ../plugins/groupwise-features/share-folder-common.c:137
+#, c-format
 msgid "Creating folder '%s'"
-msgstr "Pravljenje fascikle â%sâ"
+msgstr "Pravim fasciklu â%sâ"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:701
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:694
+#: ../mail/em-folder-utils.c:702
 #: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-folder-utils.c:714
+#: ../mail/em-folder-utils.c:722
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "Odjava sa fascikle â%sâ"
+msgstr "Odjavljujem se sa fascikle â%sâ"
 
 #: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
@@ -11034,7 +10882,7 @@ msgstr "Nepotpisano"
 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."
+msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
 
 #: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
@@ -11046,7 +10894,7 @@ msgid ""
 "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:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
@@ -11130,21 +10978,21 @@ 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:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
-msgstr "Pre_gledaj sertifikat"
+msgstr "Pre_gledaj uverenje"
 
 #: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
-msgstr "Ovaj sertifikat nije Äitljiv"
+msgstr "Ovo uverenje nije Äitljivo"
 
 #: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
-"Evolucija ne moÅe da iscrta ovo pismo poÅto je preveliko. MoÅete ga "
-"pogledati neformatirano ili pomoÄu drugog ureÄivaÄa teksta."
+"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:725
 msgid "Completed on"
@@ -11159,15 +11007,15 @@ msgstr "PrekoraÄeno:"
 msgid "by"
 msgstr "od"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "O_tvori pomoÄu"
 
@@ -11182,61 +11030,58 @@ msgstr "Oblikovanje poruke"
 
 #: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
-msgstr "Oblikovanje poruke..."
+msgstr "Oblikujem poruku..."
 
 #: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
-#, fuzzy, c-format
-#| msgid "Retrieving `%s'"
+#, c-format
 msgid "Retrieving '%s'"
-msgstr "DovlaÄenje â%sâ"
+msgstr "DovlaÄim â%sâ"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1911
 msgid "Unknown external-body part."
 msgstr "Nepoznat spoljni deo poruke."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1919
 msgid "Malformed external-body part."
 msgstr "LoÅe sloÅen spoljni deo poruke."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "PokazivaÄ na FTP stranicu (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:1960
 #, 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:1952
+#: ../mail/em-format-html.c:1962
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "PokazivaÄ na lokalnu datoteku (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:1983
 #, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "PokazivaÄ na mreÅni podatak (%s)"
+msgstr "PokazivaÄ na udaljeni podatak (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:1994
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "PokazivaÄ na nepoznati spoljni podatak (tipa â%sâ)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
-#, fuzzy, c-format
-#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+#: ../mail/em-format-html.c:2657
+#, c-format
 msgid "This message was sent by %s on behalf of %s"
-msgstr "Poruku Åalje <b>%s</b> u ime <b>%s</b>"
+msgstr "Poruku Åalje %s u ime %s"
 
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
-#, fuzzy, c-format
-#| msgid "No summary available."
+#, c-format
 msgid "No HTML stream available"
-msgstr "Nema dostupnog saÅetka."
+msgstr "Nije dostupan HTML tok."
 
 #: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -11257,24 +11102,23 @@ msgstr "Izaberite server."
 
 #: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
-msgstr "Nije izabran server"
+msgstr "Nijedan server nije izabran"
 
-#. Translators: This message is shown only for ten or more messages to be opened.
-#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
-#. then write it doubled, like '%%'.
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
 #: ../mail/em-utils.c:106
-#, fuzzy, c-format
-#| msgid "Are you sure you want to open {0} messages at once?"
-msgid "Are you sure you want to open %d messages at once?"
+#, 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 {0} poruka odjednom?"
-msgstr[1] "Sigurno Åelite da otvorite {0} poruka odjednom?"
-msgstr[2] "Sigurno Åelite da otvorite {0} poruka 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 ovu jednu poruku?"
 
 #: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
-#, fuzzy
-#| msgid "_Do not show this message again."
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
@@ -11285,7 +11129,7 @@ msgstr "Filteri poruka"
 #: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
-msgstr "Poruke od %s"
+msgstr "Poruke koje je poslao %s"
 
 #: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
@@ -11297,39 +11141,39 @@ 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 "\"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:5
 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:6
 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:7
 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:8
 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:9
 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:10
 msgid "Always request read receipt"
@@ -11337,7 +11181,7 @@ msgstr "Uvek traÅi povratnicu"
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
-msgstr "Automatsko prepoznavanje emotikona"
+msgstr "Automatsko prepoznavanje smajliÄa"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
@@ -11345,7 +11189,7 @@ msgstr "Automatsko prepoznavanje veza"
 
 #: ../mail/evolution-mail.schemas.in.h:14
 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:15
 msgid "Citation highlight color"
@@ -11353,7 +11197,7 @@ msgstr "Boja isticanja citata"
 
 #: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
-msgstr "Boja isticanja citata."
+msgstr "Boja za isticanja citata."
 
 #: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
@@ -11361,7 +11205,7 @@ msgstr "Podrazumevana visina prozora sastavljaÄa"
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
-msgstr "Podrazumevana Åirina prozora sastavljaÄa"
+msgstr "Podrazumevana Åirina za prozor sastavljaÄa"
 
 #: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
@@ -11369,13 +11213,15 @@ msgstr "Direktorijum sastavljaÄa za uÄitavanje/prilaganje"
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "SaÅmi prikaz adresa u TO/CC/BCC"
+msgstr "SaÅima prikaz adresa u TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr "SaÅmi prikaz adresa u TO/CC/BCC na broj odreÄen u address_count."
+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:22
 msgid ""
@@ -11395,7 +11241,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:25
 msgid "Default charset in which to compose messages"
@@ -11458,12 +11304,12 @@ 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:40
 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:41
 msgid ""
@@ -11472,7 +11318,7 @@ msgid ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"UtvrÄuje da li da pretraÅi u adresaru adrese poÅiljaoca. Ukoliko je pronaÄe, "
+"UtvrÄuje da li u adresaru da pretraÅi adrese poÅiljaoca. Ukoliko je pronaÄe, "
 "ne svrstava je u neÅeljenu poÅtu. TraÅi je u adresarima oznaÄenim za "
 "samodopunjavanje. MoÅe biti sporo ako su adresari (recimo LDAP) oznaÄeni za "
 "samodopunjavanje."
@@ -11497,7 +11343,7 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"UtvrÄuje da li da koristi isti font u poljima âÅaljeâ and âNaslovâ u uspravnom "
+"UtvrÄuje da li da koristi isti font u poljima âÅaljeâ i âNaslovâ u uspravnom "
 "pregledu kolone âPorukeâ."
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -11514,11 +11360,11 @@ msgstr "IskljuÄuje ili omoguÄava skraÄivanje naziva fascikli u boÄnoj povrÅ
 
 #: ../mail/evolution-mail.schemas.in.h:48
 msgid "Display only message texts not exceeding certain size"
-msgstr "PrikaÅi samo tekst poruka koje ne prelaze odreÄenu veliÄinu"
+msgstr "Prikazuje samo tekst poruka koje ne prelaze odreÄenu veliÄinu"
 
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
-msgstr "Ne dodaj razdvojnik potpisa"
+msgstr "Ne dodaje razdvojnik potpisa"
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
@@ -11546,11 +11392,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:56
 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:57
 msgid "Enable or disable magic space bar"
@@ -11562,7 +11408,7 @@ msgstr "UkljuÄuje ili iskljuÄuje upozorenje pri oznaÄavanju viÅe poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:59
 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:60
 msgid "Enable search folders"
@@ -11577,7 +11423,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:63
@@ -11593,22 +11439,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:65
 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:66
-#, 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:67
 msgid "Enable/disable caret mode"
@@ -11616,7 +11458,7 @@ msgstr "UkljuÄuje/iskljuÄuje prikaz kursora"
 
 #: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
-msgstr "Kodiraj nazive datoteka na Outlook/GMail naÄin"
+msgstr "Kodiranje naziva datoteka na naÄin Autluka/GpoÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
@@ -11625,17 +11467,17 @@ 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:70
 msgid "Flush Outbox after filtering"
-msgstr ""
+msgstr "Prazni slanje nakon filtriranja"
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Group Reply replies to list"
-msgstr ""
+msgstr "Grupisanje odgovora Odgovori na spisku"
 
 #: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
@@ -11643,7 +11485,7 @@ msgstr "Visina povrÅi liste poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:73
 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:74
 msgid "Hides the per-folder preview and removes the selection"
@@ -11654,8 +11496,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:76
 msgid ""
@@ -11669,30 +11511,30 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:77
 msgid "Ignore list Reply-To:"
-msgstr ""
+msgstr "Zanemaruje listu âOdgovor-za:â"
 
 #: ../mail/evolution-mail.schemas.in.h:78
 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:79
 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:80
 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:81
@@ -11702,10 +11544,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:82
 msgid ""
@@ -11714,8 +11556,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."
 
@@ -11727,34 +11569,34 @@ 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:84
 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:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"PoÄetna Åirina prozora âUreÄivaÄa fascikle pretrageâ. Vrednost se aÅurira "
-"ukoliko korisnik proÅiri prozor."
+"PoÄetna Åirina prozora ureÄivaÄa fascikle pretrage. Vrednost se aÅurira "
+"ukoliko korisnik raÅiri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"PoÄetna Åirina prozora âSlanje i primanje poÅteâ. Vrednost se aÅurira ukoliko "
-"korisnik proÅiri prozor."
+"PoÄetna Åirina prozora slanja i primanja poÅte. Vrednost se aÅurira ukoliko "
+"korisnik raÅiri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
@@ -11763,6 +11605,9 @@ msgid ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
+"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:88
 msgid ""
@@ -11771,26 +11616,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:89
-#, fuzzy
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that deleting messages "
-#| "from a search folder permanently deletes the message, not simply removing "
-#| "it from the search results."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr ""
-"OmoguÄava/onemoguÄava ponavljanje upozorenja da je brisanje poruke iz fascikle "
-"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+"OmoguÄava/onemoguÄava ponavljanje upozorenja da Åaljete privatan odgovor na "
+"poruku koja je stigla sa dopisne liste."
 
 #: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
+"OmoguÄava/onemoguÄava ponavljanje upozorenja da Åaljete odgovor mnogim ljudima."
 
 #: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
@@ -11798,16 +11639,15 @@ 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:92
-#, fuzzy
-#| msgid "Last time empty junk was run"
 msgid "Last time Empty Junk was run"
 msgstr "Poslednje vreme praÅnjenja Äubreta"
 
 #: ../mail/evolution-mail.schemas.in.h:93
-#, fuzzy
-#| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme praÅnjenja smeÄa"
 
@@ -11821,7 +11661,7 @@ msgstr "Spisak oznaka i njima dodeljenih boja"
 
 #: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Lista MIME tipova radi provere za Bonobo pregledaÄima delova"
+msgstr "Lista MIME tipova za proveru u pregledaÄima Bonobo delova"
 
 #: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
@@ -11841,7 +11681,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
-msgstr "Spisak prilagoÄenih zaglavlja i da li su ukljuÄena."
+msgstr "Spisak proizvoljnih zaglavlja i da li su ukljuÄena."
 
 #: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
@@ -11853,7 +11693,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:104
 msgid "List of protocol names whose license has been accepted."
@@ -11869,13 +11709,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:107
 msgid "Log filter actions"
-msgstr "BeleÅi radnje filtera"
+msgstr "Dnevnik radnji filtera"
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
@@ -11903,11 +11743,11 @@ msgstr "Åirina pregledaÄa poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:114
 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:115
 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:116
 msgid "Mark citations in the message \"Preview\""
@@ -11918,16 +11758,14 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "OznaÄava citate u pregledu poruke."
 
 #: ../mail/evolution-mail.schemas.in.h:118
-#, 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:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"Stil prikaza poruke (ânormalâ za normalan prikaz; âfull headersâ za prikaz "
-"svih zaglavlja; âsourceâ za izvorni prikaz)"
+"Stil prikaza poruke (normal â za normalan prikaz; full headers â za prikaz "
+"svih zaglavlja; source â za izvorni prikaz)"
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
@@ -11947,7 +11785,7 @@ msgstr "Najmanje vreme izmeÄu praÅnjenja smeÄa na izlazu, u danima."
 
 #: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Broj adresa za prikaz u TO/CC/BCC"
+msgstr "Broj adresa za prikaz u KO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
@@ -11964,25 +11802,19 @@ msgstr "Pita korisnika kada pokuÅa da poÅalje poruku bez naslova."
 
 #: ../mail/evolution-mail.schemas.in.h:128
 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:129
-#, 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:130
-#, 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:131
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
-msgstr "Upozori kada ÅaljeÅ poruke samo sa navedenim Bcc primaocima"
+msgstr "Pita kada odgovarate veÄem broju primalaca"
 
 #: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
@@ -11990,7 +11822,7 @@ msgstr "Pita pri praÅnjenju"
 
 #: ../mail/evolution-mail.schemas.in.h:133
 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:134
 msgid "Prompt when user tries to open 10 or more messages at once"
@@ -12018,7 +11850,7 @@ msgstr "Pita pri oznaÄavanju viÅe poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:139
 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:140
 msgid "Put the cursor at the bottom of replies"
@@ -12026,7 +11858,7 @@ msgstr "Postavlja kursor na dno odgovora"
 
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
-msgstr "Prepoznaje emotikone u tekstu i zamenjuje ih slikama."
+msgstr "Prepoznaje smajliÄe u tekstu i zamenjuje ih slikama."
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
@@ -12038,7 +11870,7 @@ msgstr "Proverava da li ima Äubreta u dolaznoj poÅti."
 
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
-msgstr "SaÄuvaj direktorijum"
+msgstr "Direktorijum Äuvanja"
 
 #: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
@@ -12046,55 +11878,55 @@ msgstr "TraÅi sliku poÅiljaoca u lokalnim adresarima"
 
 #: ../mail/evolution-mail.schemas.in.h:146
 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:147
 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:148
 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:149
 msgid "Server synchronization interval"
-msgstr "Interval sinhronizacije sa serverom"
+msgstr "Interval usaglaÅavanja sa serverom"
 
 #: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
-"Postavite na TRUE u sluÄaju da ne Åelite dodavanje razdvojnika ispred potpisa "
-"pri pisanju. "
+"Izaberite ovu opciju u sluÄaju da ne Åelite dodavanje razdvojnika ispred "
+"potpisa prilikom pisanja poruke. "
 
 #: ../mail/evolution-mail.schemas.in.h:151
 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:152
 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:153
 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:154
 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:155
 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:156
 msgid "Show Animations"
-msgstr "PrikaÅi animacije"
+msgstr "Prikazivanje animacija"
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
-msgstr "PrikaÅi sva zaglavlja poruka"
+msgstr "Prikazivanje svih zaglavlja poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
@@ -12110,19 +11942,19 @@ msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:161
 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:162
 msgid "Show image animations"
-msgstr "Prikazuje animirane slike"
+msgstr "Prikazivanje animiranih slika"
 
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
-msgstr "Prikazuje originalnu vrednost âDatumâ."
+msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
-msgstr "Prikatuje sliku poÅiljaoca"
+msgstr "Prikazivanje slike poÅiljaoca"
 
 #: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
@@ -12161,7 +11993,7 @@ msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"Prikazuje polje âOdgovor zaâ pri slanju na poruke. Ovo se postavlja iz menija "
+"Prikazuje polje âOdgovor zaâ pri slanju poruke. Ovo se postavlja iz menija "
 "âPregledâ nakon izbora naloga naloga poÅte."
 
 #: ../mail/evolution-mail.schemas.in.h:170
@@ -12194,10 +12026,17 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
+"Neki 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:174
 msgid "Spell check inline"
-msgstr "Provera pravopisa unutar"
+msgstr "UnutraÅnja provera pravopisa"
 
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
@@ -12224,18 +12063,18 @@ msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za Äubre"
 
 #: ../mail/evolution-mail.schemas.in.h:181
-#, fuzzy
-#| msgid "The last time empty junk was run, in days since the epoch."
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr "Poslednje vreme praÅnjenja Äubreta, u danima od poÄetka epohe."
+msgstr ""
+"Kada je poslednji put izvrÅeno praÅnjenje Äubreta, u danima od 1. januara, 1970 "
+"(epoh)."
 
 #: ../mail/evolution-mail.schemas.in.h:182
-#, fuzzy
-#| msgid "The last time empty trash was run, in days since the epoch."
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "Vreme praÅnjenja smeÄa, u danima od poÄetka epohe."
+msgstr ""
+"Kada je poslednji put izvrÅeno praÅnjenje smeÄa, u danima od 1. januara, 1970 "
+"(epoh)."
 
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
@@ -12244,9 +12083,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:184
 msgid "The terminal font for mail display."
@@ -12261,22 +12100,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:187
-#, fuzzy
-#| msgid ""
-#| "This decides the max size of the text part that can be formatted under "
-#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
 "is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Ovo odreÄuje najveÄu veliÄinu tekstualnog dela koji moÅe biti formatiran u "
-"Evoluciji. Podrazumevano je 4MB / 4096 KB i navedeno je kao broj KB."
+"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:188
 msgid ""
@@ -12303,9 +12140,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:191
 msgid ""
@@ -12327,14 +12165,14 @@ 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:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
-"Ovo podeÅavanje odreÄuje da li Äe nizovi podrazumevano biti raÅireni ili "
+"Ovo podeÅavanje odreÄuje da li Äe niti podrazumevano biti raÅireni ili "
 "skupljeni. Evolucija zahteva ponovno pokretanje."
 
 #: ../mail/evolution-mail.schemas.in.h:195
@@ -12343,12 +12181,12 @@ 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:196
 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:197
 msgid "Timeout for marking message as seen"
@@ -12356,7 +12194,7 @@ msgstr "Vreme za oznaÄavanje poruke kao viÄene"
 
 #: ../mail/evolution-mail.schemas.in.h:198
 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:199
 msgid "UID string of the default account."
@@ -12368,19 +12206,19 @@ msgstr "Boja za podvlaÄenje pravopisnih greÅki prilikom provere pravopisa."
 
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
-msgstr "Koristi servis i klijenta Ubice spama"
+msgstr "KoriÅÄenje servia i klijenta Ubice spama"
 
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
+msgstr "KoristiÄe demona i klijenta Ubice spama (spamc/spamd)."
 
 #: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
-msgstr "Koristi sopstvene fontove"
+msgstr "KoriÅÄenje sopstvenih fontova"
 
 #: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
-msgstr "Koristi prilagoÄene fontove za prikaz poÅte."
+msgstr "KoristiÄe prilagoÄene fontove za prikaz poÅte."
 
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
@@ -12396,7 +12234,7 @@ msgid ""
 "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."
 
@@ -12406,9 +12244,9 @@ msgid ""
 "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:209
 msgid "Variable width font"
@@ -12440,6 +12278,9 @@ msgid ""
 "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:215
 msgid "Width of the message-list pane"
@@ -12455,26 +12296,24 @@ msgstr "UvoÅenje Elm podataka"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../modules/mail/e-mail-shell-view.c:1011
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "PoÅta"
 
 #: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
-msgstr "Evolucija Elm uvoznik"
+msgstr "Elm uvoznik Evolucije"
 
 #: ../mail/importers/elm-importer.c:367
 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:116
 #: ../plugins/dbx-import/dbx-importer.c:226
-#, fuzzy
-#| msgid "Destination folder:"
 msgid "_Destination folder:"
-msgstr "OdrediÅna fascikla:"
+msgstr "_OdrediÅna fascikla:"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/dbx-import/dbx-importer.c:232
@@ -12487,28 +12326,22 @@ msgstr "Izaberite fasciklu"
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
-#, fuzzy
-#| msgid "Subject"
+#: ../mail/importers/evolution-mbox-importer.c:382
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Naslov"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
-#, fuzzy
-#| msgid "From"
+#: ../mail/importers/evolution-mbox-importer.c:387
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Åalje"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../mail/importers/evolution-mbox-importer.c:431
 #: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poÅtansko sanduÄe (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poÅtanskog sanduÄeta"
 
@@ -12521,28 +12354,27 @@ msgstr "UvoÅenje poÅtanskog sanduÄeta"
 #: ../plugins/dbx-import/dbx-importer.c:554
 #: ../plugins/pst-import/pst-importer.c:452
 #: ../plugins/pst-import/pst-importer.c:558
-#, fuzzy, c-format
-#| msgid "Importing `%s'"
+#, c-format
 msgid "Importing '%s'"
-msgstr "UvoÅenje â%sâ"
+msgstr "Uvozim â%sâ"
 
 #: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
-msgstr "Pretraga %s"
+msgstr "PretraÅujem â%sâ"
 
 #: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
-msgstr "UvoÅenje Pine podataka"
+msgstr "UvoÅenje Pine podatke"
 
 #: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Address Book"
 msgstr "Adresar"
 
 #: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
+msgstr "Pine uvoznik Evolucije"
 
 #: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
@@ -12572,28 +12404,35 @@ msgstr "%s dopisna lista"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed folder. For more than one filter
-#. rule is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-autofilter.c:450
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:451
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%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] ""
 
 #. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
 msgid "(Not Recommended)"
-msgstr ""
+msgstr "(Ne preporuÄuje se)"
 
 #: ../mail/mail-config.ui.h:3
 msgid "(Note: Requires restart of the application)"
@@ -12613,15 +12452,15 @@ msgstr "_Uvek potpiÅi odlazeÄe poruke sa ovog naloga"
 
 #: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "_TakoÄe Åifruj na sebe pri slanju Åifrovane poÅte"
+msgstr "_TakoÄe Åifruj sebi pri slanju Åifrovane poÅte"
 
 #: ../mail/mail-config.ui.h:9
 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:10
 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:11
 msgid "Always _trust keys in my keyring when encrypting"
@@ -12629,7 +12468,7 @@ msgstr "Uvek _veruj kljuÄevima mog priveska pri Åifrovanju"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Uv_ek Åifruj i meni pri slanju Åifrovane poÅte"
+msgstr "Uv_ek i meni Åifruj pri slanju Åifrovane poÅte"
 
 #: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
@@ -12637,16 +12476,16 @@ msgstr "Uvek traÅi povratnicu"
 
 #: ../mail/mail-config.ui.h:14
 msgid "Apply the same _view settings to all folders"
-msgstr ""
+msgstr "Primeni ista podeÅavanja _pregleda na svim fasciklama"
 
 #: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../modules/addressbook/addressbook-config.c:1020
 msgid "Authentication"
-msgstr "Autentifikacija"
+msgstr "PotvrÄivanje identiteta"
 
 #: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
-msgstr "Uvek umetni slike _emotikona"
+msgstr "Uvek umetni slike _smajliÄa"
 
 #: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
@@ -12658,7 +12497,7 @@ msgstr "_Proveri podrÅane tipove"
 
 #: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
-msgstr "Proveri ima li Äubreta u _prilagoÄenim zaglavljima"
+msgstr "Proveri ima li Äubreta u _proizvoljnim zaglavljima"
 
 #: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
@@ -12717,14 +12556,10 @@ 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"
 
 #: ../mail/mail-config.ui.h:40
-#, fuzzy
-#| msgid "Do not format messages when text si_ze exceeds"
 msgid "Do not display messages when text si_ze exceeds"
 msgstr "Ne formatiraj poruke kada veliÄi_na preÄe"
 
@@ -12738,19 +12573,19 @@ msgstr "Ne citiraj"
 
 #: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
-msgstr "_Fascikla Nacrti:"
+msgstr "_Fascikla nacrta:"
 
 #: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
-msgstr "Elektronska _adresa:"
+msgstr "Adresa _e-poÅte:"
 
 #: ../mail/mail-config.ui.h:45
 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 "Enable Magic S_pacebar"
-msgstr "OmoguÄava MagiÄnu razmak_nicu"
+msgstr "UkljuÄi MagiÄnu razmak_nicu"
 
 #: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
@@ -12758,7 +12593,7 @@ msgstr "UkljuÄi fascikle pret_rage"
 
 #: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
-msgstr "Sertifikat za Åi_frovanje:"
+msgstr "Uverenje za Åi_frovanje:"
 
 #: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
@@ -12778,7 +12613,7 @@ msgstr "Osobine fonta"
 
 #: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
-msgstr "Oblikuj poruke u H_TML"
+msgstr "Oblikuj poruke u HTM_L"
 
 #: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
@@ -12786,7 +12621,7 @@ msgstr "Ime i prezime:"
 
 #: ../mail/mail-config.ui.h:57
 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:58
 msgid "HTML Messages"
@@ -12794,7 +12629,7 @@ msgstr "HTML poruke"
 
 #: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
-msgstr "H_TTP posrednik:"
+msgstr "HTTP _posrednik:"
 
 #: ../mail/mail-config.ui.h:60
 msgid "Headers"
@@ -12806,7 +12641,7 @@ msgstr "Naglasi _citate sa"
 
 #: ../mail/mail-config.ui.h:63
 msgid "Ignore Reply-To: for mailing lists"
-msgstr ""
+msgstr "Zanemari âOdgovor-za:â za dopisne liste"
 
 #: ../mail/mail-config.ui.h:64
 msgid "Inline"
@@ -12814,7 +12649,7 @@ msgstr "Unutar"
 
 #: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
-msgstr "Unutar (Outlook stil)"
+msgstr "Unutar (Autluk stil)"
 
 #: ../mail/mail-config.ui.h:67
 msgid "KB"
@@ -12860,13 +12695,14 @@ msgstr "Bez _posrednika za:"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Napomena: neÄete biti upitani za lozinku dok se ne poveÅete prvi put"
+msgstr ""
+"Napomena: neÄete biti upitani za lozinku sve dok se ne poveÅete prvi put"
 
 #: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"Opcija se zanemaruje ukoliko je pronaÄeno poklapanje sa prilagoÄenim "
-"zaglavljem za Äubretom."
+"Opcija se zanemaruje ukoliko je pronaÄeno poklapanje sa proizvoljnim zaglavljem "
+"Äubreta."
 
 #: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
@@ -12891,7 +12727,7 @@ msgstr "Port:"
 
 #: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Upozori kada ÅaljeÅ poruke samo sa navedenim Bcc primaocima"
+msgstr "Upozori kada _ÅaljeÅ poruke samo sa navedenim Bcc primaocima"
 
 #: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -12903,19 +12739,15 @@ msgstr "Fontovi za Åtampu"
 
 #: ../mail/mail-config.ui.h:91
 msgid "Prompt when mailing list redirects private reply back to list"
-msgstr ""
+msgstr "Upozori kada dopisna lista preusmeri privatni odgovor nazad na listu"
 
 #: ../mail/mail-config.ui.h:92
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "Pita pri oznaÄavanju viÅe poruka"
+msgstr "Upozori prilikom slanja privatnih odgovora na poruke dopisne _liste"
 
 #: ../mail/mail-config.ui.h:93
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when sending replies to _many recipients"
-msgstr "Upozori kada ÅaljeÅ poruke samo sa navedenim Bcc primaocima"
+msgstr "Upozori prilikom slanja odgovora _prevelikom broju primaocima"
 
 #: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
@@ -12943,19 +12775,19 @@ msgstr "Obavezni podaci"
 
 #: ../mail/mail-config.ui.h:101
 msgid "SHA1"
-msgstr ""
+msgstr "SHA1"
 
 #: ../mail/mail-config.ui.h:102
 msgid "SHA256"
-msgstr ""
+msgstr "SHA256"
 
 #: ../mail/mail-config.ui.h:103
 msgid "SHA384"
-msgstr ""
+msgstr "SHA384"
 
 #: ../mail/mail-config.ui.h:104
 msgid "SHA512"
-msgstr ""
+msgstr "SHA512"
 
 #: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
@@ -12987,11 +12819,11 @@ msgstr "Odabira fasciklu Priprema"
 
 #: ../mail/mail-config.ui.h:114
 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:115
 msgid "Select HTML fixed width font for printing"
-msgstr "Izaberite HTML font fiksirane veliÄine za Åtampu"
+msgstr "Izaberite HTML font stalne veliÄine za Åtampu"
 
 #: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
@@ -13002,20 +12834,16 @@ msgid "Select HTML variable width font for printing"
 msgstr "Izaberite HTML font promenljive veliÄine za Åtampu"
 
 #: ../mail/mail-config.ui.h:118
-#, fuzzy
-#| msgid "Select Folder"
 msgid "Select Junk Folder"
-msgstr "Izaberite fasciklu"
+msgstr "Izaberite fasciklu za Äubre"
 
 #: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "Odabira fasciklu Poslato"
 
 #: ../mail/mail-config.ui.h:120
-#, fuzzy
-#| msgid "Select Drafts Folder"
 msgid "Select Trash Folder"
-msgstr "Odabira fasciklu Priprema"
+msgstr "Izaberite fasciklu za smeÄe"
 
 #: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
@@ -13035,7 +12863,7 @@ msgstr "Poslate poruke i nacrti"
 
 #: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
-msgstr "Ser_ver traÅi autentifikaciju"
+msgstr "Ser_ver traÅi potvrÄivanje identiteta"
 
 #: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
@@ -13043,13 +12871,11 @@ msgstr "PodeÅavanje servera"
 
 #: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
-msgstr "_Tip servera: "
+msgstr "_Tip servera:"
 
 #: ../mail/mail-config.ui.h:128
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
-msgstr "Sertifikat za _potpisivanje:"
+msgstr "Algoritam _potpisivanja:"
 
 #: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
@@ -13057,7 +12883,7 @@ msgstr "Pot_pisi"
 
 #: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
-msgstr "Sertifikat za _potpisivanje:"
+msgstr "Uverenje _potpisivanja:"
 
 #: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
@@ -13068,10 +12894,8 @@ msgid "Signatures"
 msgstr "Potpisi"
 
 #: ../mail/mail-config.ui.h:133
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
-msgstr "Sertifikat za _potpisivanje:"
+msgstr "Algoritam p_otpisa:"
 
 #: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
@@ -13079,7 +12903,7 @@ msgstr "Provera pravopisa"
 
 #: ../mail/mail-config.ui.h:135
 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:137
 msgid "T_ype:"
@@ -13099,15 +12923,13 @@ 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. "
 
 #. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
 #: ../mail/mail-config.ui.h:143
-#, fuzzy
-#| msgid "Posting destination"
 msgid "Top Posting Option"
-msgstr "OdrediÅna poÅta"
+msgstr "Opcija postavljanja na vrh"
 
 #: ../mail/mail-config.ui.h:144
 msgid ""
@@ -13123,7 +12945,7 @@ msgstr "KorisniÄko_ime:"
 
 #: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
-msgstr "Koristi aute_ntifikaciju"
+msgstr "Koristi _potvrÄivanje identiteta"
 
 #: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
 #: ../plugins/google-account-setup/google-contacts-source.c:286
@@ -13142,11 +12964,11 @@ msgstr "_Dodaj potpis"
 
 #: ../mail/mail-config.ui.h:151
 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:152
 msgid "_Authentication Type"
-msgstr "Tip _autentifikacije"
+msgstr "Tip po_tvrÄivanja identiteta"
 
 #: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
@@ -13158,7 +12980,7 @@ msgstr "_Direktna veza sa Internetom"
 
 #: ../mail/mail-config.ui.h:155
 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:156
 msgid "_Forward style:"
@@ -13166,10 +12988,8 @@ msgstr "Stil _prosleÄivanja:"
 
 # bug: requires a comment on usage
 #: ../mail/mail-config.ui.h:157
-#, fuzzy
-#| msgid "Current Folder"
 msgid "_Junk Folder:"
-msgstr "tekuÄoj fascikli"
+msgstr "Fascikla za _Äubre:"
 
 #: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
@@ -13181,7 +13001,7 @@ msgstr "_Jezici"
 
 #: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
-msgstr "_UÄitaj slike od kontakata u poruku"
+msgstr "_UÄitaj slike iz kontakata u poruku"
 
 #: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
@@ -13213,7 +13033,7 @@ msgstr "_Upozori pri slanju HTML poÅte kontaktima koji ih ne Åele"
 
 #: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "_Upozori kada ÅaljeÅ poruke bez naslova"
+msgstr "_Upozori prilikom slanja poruke bez naslova"
 
 #: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
@@ -13247,10 +13067,8 @@ msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_SaÅmi zaglavlja To / Cc / Bcc u "
 
 #: ../mail/mail-config.ui.h:180
-#, fuzzy
-#| msgid "Drafts _Folder:"
 msgid "_Trash Folder:"
-msgstr "_Fascikla Nacrti:"
+msgstr "Fascikla za _smeÄe:"
 
 #: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
@@ -13264,7 +13082,7 @@ msgstr "_Koristi sistemske postavke"
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
@@ -13273,7 +13091,7 @@ msgstr "a"
 msgid "addresses"
 msgstr "Adrese"
 
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
@@ -13291,7 +13109,7 @@ 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"
@@ -13307,10 +13125,8 @@ msgid "Co_mpleted"
 msgstr "Za_vrÅeno"
 
 #: ../mail/mail-dialogs.ui.h:6
-#, fuzzy
-#| msgid "collapse"
 msgid "Collapse _all"
-msgstr "skuplja"
+msgstr "_Skupi sve"
 
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
@@ -13321,14 +13137,12 @@ msgid "Do Not Forward"
 msgstr "Ne prosleÄuj"
 
 #: ../mail/mail-dialogs.ui.h:9
-#, fuzzy
-#| msgid "E_xpand All Threads"
 msgid "E_xpand all"
-msgstr "Razgranaj sve ra_sprave"
+msgstr "_Razgranaj sve"
 
 #: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
-msgstr "Åifriranje"
+msgstr "Åifrovanje"
 
 #: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
@@ -13340,7 +13154,7 @@ msgstr "Sledi"
 
 #: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
-msgstr "Za VaÅu informaciju"
+msgstr "Za vaÅu informaciju"
 
 #: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
@@ -13368,7 +13182,7 @@ msgstr "S_erver:"
 
 #: ../mail/mail-dialogs.ui.h:23
 msgid "S_how only items containing:"
-msgstr ""
+msgstr "PrikaÅi sa_mo stavke koje sadrÅe:"
 
 #: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
@@ -13376,7 +13190,7 @@ msgstr "Izvor fascikle pretrage"
 
 #: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
-msgstr "Sigurnosni podaci"
+msgstr "Podaci bezbednosti"
 
 #: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
@@ -13388,7 +13202,7 @@ msgid ""
 "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:29
 msgid "_Accept License"
@@ -13406,10 +13220,10 @@ msgstr "_Oznaka:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_naÄite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:782
 #, c-format
 msgid "Pinging %s"
-msgstr "Ispitujem dostupnost za %s"
+msgstr "Ispitujem dostupnost za â%sâ"
 
 #: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
@@ -13419,279 +13233,267 @@ msgstr "Filtriranje izabranih poruka"
 msgid "Fetching Mail"
 msgstr "Uzimanje poÅte"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:596
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Neuspela primena odlazeÄih filtera: %s"
+msgstr "Nisam uspeo da primenim odlazeÄe filtere: %s"
 
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, fuzzy, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
+#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:640
+#, 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"
+"PrikaÄiÄu u lokalnu fasciklu âPoslatoâ."
 
-#: ../mail/mail-ops.c:654
-#, fuzzy, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:659
+#, 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/mail-ops.c:774 ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:779 ../mail/mail-ops.c:871
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:787
 #, 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:826
+#: ../mail/mail-ops.c:831
 #, 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:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "ZavrÅeno."
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:943
 #, c-format
 msgid "Saving message to folder '%s'"
-msgstr "Äuvanje poruke u fasciklu â%sâ"
+msgstr "Äuvam poruku u fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Moving messages to '%s'"
-msgstr "PremeÅtanje poruka u â%sâ"
+msgstr "PremeÅtam poruke u â%sâ"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Copying messages to '%s'"
-msgstr "UmnoÅavanje poruka u â%sâ"
+msgstr "UmnoÅavam poruke u â%sâ"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1132
 #, c-format
 msgid "Scanning folders in '%s'"
-msgstr "Pretraga fascikli u â%sâ"
+msgstr "PretraÅujem fascikle u â%sâ"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "ProsleÄene poruke"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1281
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Otvaranje fascikle â%sâ"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1347
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
-msgstr "Dobijanje podataka o kvoti za fasciklu â%sâ"
+msgstr "Dobavljam podatak o kvoti za fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1419
 #, c-format
 msgid "Opening store '%s'"
-msgstr "Otvaranje ostave â%sâ"
+msgstr "Otvaram ostavu â%sâ"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Removing folder '%s'"
-msgstr "Uklanjanje fascikle â%sâ"
+msgstr "Uklanjam fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1614
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "SmeÅtanje fascikle â%sâ"
+msgstr "SmeÅtam fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1677
 #, 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:1673
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Storing account '%s'"
-msgstr "SmeÅtanje naloga â%sâ"
+msgstr "SmeÅtam nalog â%sâ"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1732
 #, c-format
 msgid "Refreshing folder '%s'"
-msgstr "OsveÅavanje fascikle â%sâ"
+msgstr "OsveÅavam fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1772
 #, c-format
 msgid "Expunging folder '%s'"
-msgstr "PraÅnjenje fascikle â%sâ"
+msgstr "Praznim fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Izbacivanje smeÄa u â%sâ"
+msgstr "Izbacujem smeÄe u â%sâ"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1818
 msgid "Local Folders"
 msgstr "Lokalne fascikle"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2021
 #, 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[0] "DovlaÄim %d poruku"
+msgstr[1] "DovlaÄim %d poruke"
+msgstr[2] "DovlaÄim %d poruka"
 msgstr[3] "DovlaÄenje %d poruke"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2110
 #, 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[0] "Äuvam %d poruku"
+msgstr[1] "Äuvam %d poruke"
+msgstr[2] "Äuvam %d poruka"
 msgstr[3] "Äuvanje %d poruke"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2197
 #, c-format
-#| msgid ""
-#| "Error saving messages to: %s:\n"
-#| " %s"
 msgid "Error saving messages to: %s:\n"
-msgstr ""
-"GreÅka pri Äuvanju poruke u: %s:\n"
+msgstr "GreÅka pri Äuvanju poruke u: %s:\n"
 
-#: ../mail/mail-ops.c:2265
+#: ../mail/mail-ops.c:2270
 msgid "Saving attachment"
-msgstr "Äuvanje priloga"
+msgstr "Äuvam priloga"
 
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2290 ../mail/mail-ops.c:2300
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"Nije moguÄe pravljenje izlazne datoteke: %s:\n"
+"Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2310
-#| msgid "Could not write data: %s"
+#: ../mail/mail-ops.c:2315
 msgid "Could not write data: "
-msgstr "Nije moguÄ upis podataka: "
+msgstr "Ne mogu da upiÅem podatke: "
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Disconnecting from '%s'"
-msgstr "Prekidanje veze sa â%sâ"
+msgstr "Prekidam vezu sa â%sâ"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Reconnecting to '%s'"
-msgstr "Ponovno povezivanje na â%sâ"
+msgstr "Ponovno se povezujem na â%sâ"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2555
 #, 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/mail-ops.c:2636
+#: ../mail/mail-ops.c:2641
 msgid "Checking Service"
-msgstr "Provera servisa"
+msgstr "Usluga provere"
 
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
-msgstr "Otkazivanje..."
+msgstr "Otkazujem..."
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje poÅte"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
 msgstr "OtkaÅi _sve"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
-msgstr "AÅuriranje..."
+msgstr "AÅuriram..."
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
-msgstr "Äekanje..."
+msgstr "Äekam..."
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
-msgstr "Provera za nove poruke"
+msgstr "Provera za novim porukama"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:228
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:230
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:233
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:235
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:283
 #, c-format
 msgid "User canceled operation."
 msgstr "Korisnik je otkazao operaciju."
 
-#: ../mail/mail-session.c:724
+#: ../mail/mail-session.c:728
 #, 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."
+msgstr "Nije dostavljena adresa odrediÅta, prosleÄivanje poruke je otkazano."
 
-#: ../mail/mail-session.c:733
+#: ../mail/mail-session.c:737
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Nije pronaÄen nalog za koriÅÄenje, prosleÄivanje poruke je otkazano."
 
 #: ../mail/mail-tools.c:128
-#, 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:161
-#, 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:273
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "ProsleÄena poruka - %s"
+msgstr "ProsleÄena poruka â %s"
 
 #: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "ProsleÄena poruka"
 
 #: ../mail/mail-tools.c:318
-#, fuzzy, c-format
-#| msgid "Invalid folder: `%s'"
+#, c-format
 msgid "Invalid folder: '%s'"
-msgstr "Neispravna fascikla â%sâ"
+msgstr "Neispravna fascikla: â%sâ"
 
 #: ../mail/mail-vfolder.c:85
 #, c-format
@@ -13708,58 +13510,60 @@ msgstr "AÅuriranje fascikla pretrage za â%s: %sâ"
 msgid "Updating Search Folders for '%s'"
 msgstr "AÅuriranje fascikla pretrage za â%sâ"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the removed folder. For more than one search
-#. folder is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:674
+#. 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:675
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%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] ""
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1290
 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 ""
@@ -13770,21 +13574,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 ""
@@ -13818,7 +13622,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?"
@@ -13849,93 +13654,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 ""
@@ -13947,27 +13750,21 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:43
 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:44
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Obrisati poruke u fascikli pretrage â{0}â?"
+msgstr "Da obriÅem poruke u fascikli pretrage â{0}â?"
 
 #: ../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"
 
@@ -13981,11 +13778,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."
@@ -13997,7 +13794,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",
@@ -14020,37 +13817,33 @@ 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:62
-#, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"Ukoliko obriÅete fasciklu, sav njen sadrÅaj i sadrÅaj podfascikli Äe biti "
-"trajno obrisani."
+"Ukoliko obriÅete fasciklu, sav njen sadrÅaj i sadrÅaj podfascikli biÄe trajno "
+"obrisani."
 
 #: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
-msgstr "Ukoliko obriÅete fasciklu, sav njen sadrÅaj Äe biti trajno obrisan."
+msgstr "Ukoliko obriÅete fasciklu, sav njen sadrÅaj biÄe trajno obrisan."
 
 #: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "Ako nastavite, svi posredniÄki nalozi biÄe trajno uklonjeni."
+msgstr "Ako nastavite, svi nalozi posrednika biÄe trajno uklonjeni."
 
 #: ../mail/mail.error.xml.h:65
 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:67
 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:68
 msgid ""
@@ -14066,7 +13859,7 @@ msgstr "Zanemari"
 
 #: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
-msgstr "Neispravna autentifikacija"
+msgstr "Neispravno potvrÄivanje identiteta"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
@@ -14083,13 +13876,14 @@ msgid ""
 "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:74
 msgid "Missing folder."
-msgstr "Nedostaje fascikla."
+msgstr "NedostajuÄa fascikla."
 
 #: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
@@ -14097,7 +13891,7 @@ msgstr "Izvori nisu izabrani."
 
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
-msgstr "Otvaranje previÅe poruka odjednom moÅe suviÅe da potraje."
+msgstr "Otvaranje previÅe poruka odjednom moÅe da potraje malo duÅe."
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
@@ -14105,15 +13899,15 @@ msgstr "Proverite podeÅavanja naloga i pokuÅajte ponovo."
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
-msgstr "OmoguÄite nalog ili poÅaljite koriÅÄenjem drugog naloga."
+msgstr "OmoguÄite nalog ili poÅaljite koristeÄi drugi nalog."
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Unesite vaÅeÄu elektronsku adresu u polje Prima:. MoÅete pretraÅiti "
-"elektronske adrese klikom na dugme Prima: pored polja za unos."
+"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:81
 msgid ""
@@ -14121,7 +13915,7 @@ msgid ""
 "HTML email:\n"
 "{0}"
 msgstr ""
-"Proverite da li sledeÄi primaoci Åele i mogu da prime HTML poÅtu:\n"
+"Proverite da li sledeÄi primaoci Åele i da li mogu da prime HTML poÅtu:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:83
@@ -14138,25 +13932,24 @@ msgstr "Problem pri prenosu stare fascikle poÅte â{0}â."
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Slanje upita serveru za listu podrÅanih mehanizama autentifikacije."
+msgstr ""
+"Slanje upita serveru za listu podrÅanih mehanizama potvrÄivanja identiteta."
 
 #: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
-msgstr "ZatraÅene povratnice."
+msgstr "ProÄitajte zatraÅene povratnice."
 
 #: ../mail/mail.error.xml.h:88
 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:89
 msgid "Really delete folder \"{0}\"?"
-msgstr "Zaista obrisati fasciklu â{0}â?"
+msgstr "Da obriÅem fasciklu â{0}â?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
-#| msgid "_Private"
 msgid "Reply _Privately"
-msgstr "L_iÄno"
+msgstr "Odgovori _privatno"
 
 #: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
@@ -14164,14 +13957,12 @@ msgstr "Fascikle pretrage su automatski aÅurirane."
 
 #: ../mail/mail.error.xml.h:94
 msgid "Send private reply?"
-msgstr ""
+msgstr "Da poÅaljem privatan odgovor?"
 
 # bug(slobo): verovatno izveÅtaj o dostavi
 #: ../mail/mail.error.xml.h:95
-#, fuzzy
-#| msgid "Sender or Recipients"
 msgid "Send reply to all recipients?"
-msgstr "PoÅiljalac ili primaoci"
+msgstr "Da poÅaljem odgovore svim primaocima?"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
@@ -14188,8 +13979,8 @@ 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:99
 msgid ""
@@ -14202,16 +13993,16 @@ 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:102
 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:104
@@ -14219,7 +14010,7 @@ 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:106
@@ -14265,29 +14056,24 @@ msgstr ""
 "Ovo oznaÄava sve poruke kao proÄitane u izabranoj fascikli i podfasciklama."
 
 #: ../mail/mail.error.xml.h:114
-#, fuzzy
-#| msgid ""
-#| "This will mark all messages as read in the selected folder and its "
-#| "subfolders."
 msgid "This will mark all messages as read in the selected folder."
-msgstr ""
-"Ovo oznaÄava sve poruke kao proÄitane u izabranoj fascikli i podfasciklama."
+msgstr "Ovo oznaÄava sve poruke kao proÄitane u izabranoj fascikli."
 
 #: ../mail/mail.error.xml.h:115
 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:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"Nije moguÄe otvaranje fascikle nacrta za ovaj nalog. Koristiti sistemsku "
-"fasciklu nacrta?"
+"Ne mogu da otvorim fasciklu nacrta za ovaj nalog. Da koristim sistemsku "
+"fasciklu nacrta umesto toga?"
 
 #: ../mail/mail.error.xml.h:117
 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:118
 msgid "Use _Default"
@@ -14295,7 +14081,7 @@ msgstr "Koristi _podrazumevano"
 
 #: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
-msgstr "Koristiti podrazumevanu fasciklu nacrta?"
+msgstr "Da koristim podrazumevanu fasciklu nacrta?"
 
 #: ../mail/mail.error.xml.h:120
 msgid ""
@@ -14313,6 +14099,9 @@ msgid ""
 "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:123
 msgid ""
@@ -14320,18 +14109,17 @@ msgid ""
 "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:124
-#, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this?"
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr ""
-"PovlaÄenje poruke je moÅe ukloniti iz sanduÄeta primaoca. Åelite li ovo da "
-"uradite? "
+"Odgovarate na poruku koja je poslata veÄem broju primalaca. Da li ste "
+"sigurni da Åelite SVIMA da odgovorite?"
 
 #: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
@@ -14343,19 +14131,19 @@ msgstr "Niste uneli sve potrebne podatke."
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Imate neposlate poruke, Åelite li ipak da izaÄete?"
+msgstr "Imate neposlate poruke, da li Åelite ipak da izaÄete?"
 
 #: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
-msgstr "Ne moÅete otvoriti dva naloga istog imena."
+msgstr "Ne moÅete da napravite dva naloga sa istim imenom."
 
 #: ../mail/mail.error.xml.h:129
 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:130
 msgid "You must specify a folder."
-msgstr "Morate navesti fasciklu."
+msgstr "Morate da navedete fasciklu."
 
 #: ../mail/mail.error.xml.h:131
 msgid ""
@@ -14363,9 +14151,9 @@ msgid ""
 "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:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -14373,7 +14161,7 @@ msgstr "Prijava na server â{0}â kao â{0}â nije uspela."
 
 #: ../mail/mail.error.xml.h:134
 msgid "_Append"
-msgstr "_Dodaj"
+msgstr "_PrikaÄi"
 
 #: ../mail/mail.error.xml.h:135
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
@@ -14383,10 +14171,10 @@ msgstr "_OnemoguÄi"
 
 #: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
-msgstr "_Zanemari promene"
+msgstr "_Odbaci izmene"
 
 #: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "Isprazni _SmeÄe"
 
@@ -14400,16 +14188,12 @@ msgstr "_Otvori poruke"
 
 # bug(slobo): verovatno izveÅtaj o dostavi
 #: ../mail/mail.error.xml.h:142
-#, fuzzy
-#| msgid "Send Receipt"
 msgid "_Send Receipt"
-msgstr "PoÅalji povratnicu"
+msgstr "PoÅalji _povratnicu"
 
 #: ../mail/mail.error.xml.h:143
-#, fuzzy
-#| msgid "Synchronize"
 msgid "_Synchronize"
-msgstr "Uskladi"
+msgstr "_Uskladi"
 
 #: ../mail/message-list.c:1170
 msgid "Unseen"
@@ -14459,11 +14243,11 @@ msgstr "?"
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1802 ../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:1811
 msgid "Yesterday %l:%M %p"
-msgstr "JuÄe %l:%M %p"
+msgstr "JuÄe u %l:%M %p"
 
 #: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
@@ -14482,19 +14266,19 @@ msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4633
+#: ../mail/message-list.c:4643
 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:4635
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -14512,7 +14296,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"
@@ -14523,36 +14307,36 @@ msgid "Sent Messages"
 msgstr "Poslate poruke"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 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:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "Telo sadrÅi"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "Poruka sadrÅi"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "Primaoci sadrÅe"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1239
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "PoÅiljalac sadrÅi"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "Naslov sadrÅi"
 
@@ -14583,20 +14367,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:602
-#, fuzzy
-#| msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:609
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Koristi u kalendaru _RoÄendani i godiÅnjice"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:645
 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:746
+#: ../modules/addressbook/addressbook-config.c:753
 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 "
@@ -14606,16 +14388,17 @@ msgstr ""
 "je spisak standardnih portova. Pitajte administratora sistema koji port da "
 "navedete."
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:827
 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:895
+#: ../modules/addressbook/addressbook-config.c:902
 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 "
@@ -14624,32 +14407,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:1011
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1023
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalji"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1024
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "PretraÅivanje"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1026
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1234
 msgid "New Address Book"
 msgstr "Novi adresar"
 
@@ -14659,39 +14442,39 @@ 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."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
-msgstr "Prikazuje samodopunjeno ime sa adresom"
+msgstr "Prikazivanje samodopunjenog imena sa adresom"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
-msgstr "PrikaÅi povrÅ za pregled"
+msgstr "Prikazivanje povrÅi za pregled"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid ""
@@ -14700,21 +14483,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:12
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Broj znakova koji se moraju ukucati pre nego Åto Evolucija pokuÅa da "
+"Broj znakova koji se moraju ukucati nakon kojih Äe Evolucija pokuÅati da "
 "samodopuni."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 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:14
 msgid "URI for the folder last used in the select names dialog."
@@ -14725,16 +14508,16 @@ 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:16
 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:162
-#: ../modules/mail/em-mailer-prefs.c:1165
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
@@ -14747,275 +14530,275 @@ 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:97
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
-msgstr "Napravi novi kontakt"
+msgstr "Napravite novi kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
-msgstr "Kontakt li_sta"
+msgstr "Li_sta kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
-msgstr "Napravi novu kontakt listu"
+msgstr "Napravite novu listu kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 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:303
+#: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-migrate.c:58
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../modules/addressbook/e-book-shell-backend.c:312
+#: ../modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
-msgstr "Sertifikati"
+msgstr "Uverenja"
 
 #. Translators: This is a save dialog title
 #: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
-msgstr "SaÄuvaj kao vKartu"
+msgstr "SaÄuvajte kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "UmnoÅi _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 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:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "O_briÅi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
-msgstr "ObriÅi izabrani adresar"
+msgstr "ObriÅite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 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:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "PodeÅavanja adresa_ra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 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:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
-msgstr "Preimenuj izabrani adresar"
+msgstr "Preimenujte izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 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:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "Prekini uÄitavanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "_UmnoÅi kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 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:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "_PronaÄi u kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 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:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 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:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 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:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
-msgstr "Novi kontakt _spisak..."
+msgstr "Nova _lista kontakta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
-msgstr "Pregledaj tekuÄi kontakt"
+msgstr "Pregledajte tekuÄi kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "_PoÅalji poruku kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 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:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 #: ../modules/calendar/e-cal-shell-view-actions.c:1496
 #: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
 #: ../modules/calendar/e-cal-shell-view-actions.c:1513
 #: ../modules/calendar/e-memo-shell-view-actions.c:670
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_ObriÅi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "O_sobine"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "_SaÄuvaj kao vKartu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 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:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "_KlasiÄni prikaz"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 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:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 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:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 #: ../modules/calendar/e-cal-shell-view-actions.c:1656
 #: ../modules/calendar/e-memo-shell-view-actions.c:744
 #: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 #: ../modules/calendar/e-cal-shell-view-actions.c:1670
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:459
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "Åtampaj sve prikazane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred Åtampu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "Åtampa izabrane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "SaÄuvaj izabrane kontakte kao VKartu"
 
@@ -15039,25 +14822,25 @@ msgstr "_PoÅalji poruku na listu"
 msgid "_Send Message to Contact"
 msgstr "_PoÅalji poruku kontaktu"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "ViÅestruke vKarte"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "vKarta za %s"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "Kontakt"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, 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
@@ -15089,15 +14872,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 ""
@@ -15146,7 +14929,7 @@ msgstr "Obim p_retrage:"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
-msgstr "_Rok:"
+msgstr "_Vremenski rok:"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
@@ -15161,29 +14944,29 @@ msgstr "karte"
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "U_vezi u zadatke"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-cal-shell-migrate.c:182
 #: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-memo-shell-migrate.c:139
 #: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-task-shell-migrate.c:148
 msgid "On The Web"
 msgstr "Na vebu"
 
@@ -15193,56 +14976,56 @@ msgid "Weather"
 msgstr "Vreme"
 
 #: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-migrate.c:61
 msgid "Birthdays & Anniversaries"
 msgstr "RoÄendani i godiÅnjice"
 
-#: ../modules/calendar/e-cal-shell-backend.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:408
 #: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:403
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:410
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:412
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:432
 #: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../modules/calendar/e-cal-shell-backend.c:729
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:169
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15251,25 +15034,23 @@ msgstr ""
 "GreÅka na %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:237
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "UÄitavanje kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:664
-#, fuzzy
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
 msgid "_New Calendar..."
-msgstr "Novi _kalendar"
+msgstr "Novi _kalendar..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:681
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, 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:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
@@ -15311,7 +15092,7 @@ msgstr "dogaÄaj"
 #: ../modules/calendar/e-memo-shell-view-actions.c:504
 #: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
-msgstr "SaÄuvaj kao iCalendar"
+msgstr "SaÄuvaj kao iKalendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1284
 #: ../modules/calendar/e-memo-shell-view-actions.c:585
@@ -15324,7 +15105,7 @@ msgstr "Ob_riÅi kalendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
-msgstr "ObriÅi izabrani kalendar"
+msgstr "ObriÅite izabrani kalendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
@@ -15344,7 +15125,7 @@ msgstr "Izaberi _datum"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
-msgstr "Bira odreÄeni datum"
+msgstr "Izaberite odreÄeni datum"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
@@ -15357,7 +15138,7 @@ msgstr "Izba_ci"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1342
 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:1347
 #: ../modules/calendar/e-memo-shell-view-actions.c:613
@@ -15367,11 +15148,11 @@ msgstr "O_sveÅi"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
-msgstr "OsveÅi izabrani kalendar"
+msgstr "OsveÅite izabrani kalendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
-msgstr "Preimenuj izabrani kalendar"
+msgstr "Preimenujte izabrani kalendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
@@ -15391,7 +15172,7 @@ msgstr "_ObriÅi zakazano"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
-msgstr "ObriÅi izabrana zakazivanja"
+msgstr "ObriÅite izabrana zakazivanja"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
@@ -15399,7 +15180,7 @@ msgstr "ObriÅi ovu _pojavu"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
-msgstr "ObriÅi ovu pojavu"
+msgstr "ObriÅite ovu pojavu"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
@@ -15407,7 +15188,7 @@ msgstr "ObriÅi sve po_jave"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
-msgstr "ObriÅi sve pojave"
+msgstr "ObriÅite sve pojave"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
@@ -15415,7 +15196,7 @@ msgstr "Novi celodnevni _dogaÄaj..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 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:1410
 #: ../modules/calendar/e-cal-shell-view-memopad.c:244
@@ -15431,7 +15212,7 @@ msgstr "Novi _sastanak..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
-msgstr "Pravi novi sastanak"
+msgstr "Napravite novi sastanak"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
@@ -15451,7 +15232,7 @@ msgstr "_Otvori sastanak"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
-msgstr "Pregleda tekuÄe zakazivanje"
+msgstr "Pregledajte tekuÄe zakazivanje"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
@@ -15460,7 +15241,7 @@ msgstr "O_dgovori"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1466
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
-msgstr "SaÄuvaj kao iCalendar..."
+msgstr "SaÄuvaj kao iKalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
@@ -15468,7 +15249,7 @@ msgstr "_ZakaÅi sastanak..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1475
 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:1480
 msgid "Conv_ert to Appointment..."
@@ -15476,7 +15257,7 @@ msgstr "Pre_tvori u zakazano..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1482
 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:1487
 msgid "Quit"
@@ -15563,10 +15344,10 @@ msgid "New _Memo"
 msgstr "Nova _beleÅka"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-backend.c:281
 #: ../modules/calendar/e-memo-shell-view-actions.c:636
 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:258
 #: ../modules/calendar/e-memo-shell-view-actions.c:641
@@ -15576,7 +15357,7 @@ msgstr "_Otvori beleÅku"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:260
 #: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
-msgstr "Pogledaj izabranu beleÅku"
+msgstr "Pogledajte izabranu beleÅku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
@@ -15588,7 +15369,7 @@ msgstr "Otvori _Veb stranicu"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:284
 #: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
-msgstr "Åtampa izabranu beleÅku"
+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.
@@ -15612,7 +15393,7 @@ msgstr "_OznaÄi kao zavrÅeno"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
 #: ../modules/calendar/e-task-shell-view-actions.c:760
 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:331
 msgid "_Mark as Incomplete"
@@ -15621,7 +15402,7 @@ msgstr "_OznaÄi kao nezavrÅeno"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
 #: ../modules/calendar/e-task-shell-view-actions.c:767
 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:338
 #: ../modules/calendar/e-task-shell-view-actions.c:772
@@ -15629,10 +15410,10 @@ msgid "New _Task"
 msgstr "Novi zad_atak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-backend.c:280
 #: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
-msgstr "Napravi novi zadatak"
+msgstr "Napravite novi zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
 #: ../modules/calendar/e-task-shell-view-actions.c:779
@@ -15642,7 +15423,7 @@ msgstr "_Otvori zadatak"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
 #: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
-msgstr "Pregleda izabrani zadatak"
+msgstr "Pregledajte izabrani zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:823
@@ -15653,45 +15434,45 @@ msgstr "_SaÄuvaj kao iKalendar..."
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
 #: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
-msgstr "Åtampa izabrani zadatak"
+msgstr "Åtampajte izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:277
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "BeleÅk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:284
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleÅka"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:288
 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:294
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:298
 #: ../modules/calendar/e-memo-shell-view-actions.c:601
 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:231
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
-msgstr "UÄitavanje beleÅki je u toku"
+msgstr "UÄitavam beleÅke"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:603
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleÅki"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:908
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, 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:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -15708,7 +15489,7 @@ msgstr "P_ronaÄi u beleÅci..."
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
-msgstr "PretraÅi tekst u prikazanoj beleÅci"
+msgstr "PretraÅite tekst u prikazanoj beleÅci"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
@@ -15716,7 +15497,7 @@ msgstr "Ob_riÅi spisak beleÅki"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:594
 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:599
 msgid "_New Memo List"
@@ -15724,11 +15505,11 @@ msgstr "_Novi spisak beleÅki"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:615
 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:622
 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:627
 msgid "Show _Only This Memo List"
@@ -15740,23 +15521,23 @@ msgstr "_Pregled beleÅki"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:708
 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:729
 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:736
 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:794
 msgid "Print the list of memos"
-msgstr "Åtampaj spisak beleÅki"
+msgstr "Åtampajte spisak beleÅki"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
-msgstr "Pregled spiska beleÅki za Åtampu"
+msgstr "Pregledajte spisak beleÅki za Åtampu"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:416
 #, c-format
@@ -15771,7 +15552,7 @@ msgstr[3] "%d beleÅka"
 #: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d selected"
-msgstr "%d izabrano"
+msgstr "izabranih â %d"
 
 #: ../modules/calendar/e-memo-shell-view.c:223
 msgid "Delete Memos"
@@ -15781,43 +15562,43 @@ msgstr "ObriÅi beleÅke"
 msgid "Delete Memo"
 msgstr "ObriÅi beleÅku"
 
-#: ../modules/calendar/e-task-shell-backend.c:275
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:282
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
-msgstr "Dodeli novi zadatak"
+msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:292
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-backend.c:297
 #: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
-msgstr "Napravi novi spisak zadataka"
+msgstr "Napravite novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:231
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
-msgstr "UÄitavanje zadataka"
+msgstr "UÄitavam zadatke"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:603
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:908
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, 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:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
@@ -15834,7 +15615,7 @@ 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:688
 msgid "_Delete Task"
@@ -15858,7 +15639,7 @@ msgstr "O_briÅi spisak zadataka"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:718
 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:723
 msgid "_New Task List"
@@ -15866,11 +15647,11 @@ msgstr "No_vi spisak zadataka"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:739
 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:746
 msgid "Rename the selected task list"
-msgstr "Preimenuj izabrani spisak zadataka"
+msgstr "Preimenujte izabrani spisak zadataka"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
@@ -15882,7 +15663,7 @@ msgstr "O_znaÄi kao nezavrÅeno"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
-msgstr "ObriÅi zavrÅene zadatke"
+msgstr "ObriÅite zavrÅene zadatke"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
@@ -15890,15 +15671,15 @@ msgstr "Pregled za_dataka"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
-msgstr "PrikaÅi pregled zadataka"
+msgstr "PrikaÅite pregled zadataka"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:893
 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:900
 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:908
 msgid "Active Tasks"
@@ -15922,11 +15703,11 @@ msgstr "Zadaci sa prilozima"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
-msgstr "Åtampaj spisak zadataka"
+msgstr "Åtampajte spisak zadataka"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:1000
 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-private.c:463
 msgid "Expunging"
@@ -15941,19 +15722,19 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
 msgstr "ObriÅi zadatke"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
 msgstr "ObriÅi zadatak"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:333
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
-msgstr "%d priloÅenih poruka"
+msgstr "priloÅenih poruka â %d"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -15967,158 +15748,159 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
-msgstr "Sastavi novu poruku"
+msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poÅtu"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 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:478
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "PoÅtanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:486
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "Postavke poÅte"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "Postavke sastavljaÄa"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "Postavke mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:930
 msgid "_Disable Account"
 msgstr "_OnemoguÄi nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:822
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
-msgstr "OnemoguÄi ovaj nalog"
+msgstr "OnemoguÄite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 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:834
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 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:843
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 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:848
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
-msgstr "Is_prazni Za slanje"
+msgstr "Is_prazni âZa slanjeâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "_UmnoÅi fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 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:864
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
-msgstr "Trajno ukloni ovu fasciklu"
+msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:871
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 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:876
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "OznaÄi sve po_ruke kao proÄitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 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:883
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:885
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 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:890
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 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:899
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
-msgstr "OsveÅava fasciklu"
+msgstr "OsveÅite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 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:918
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "Izaberi raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 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:925
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
-msgstr "Bira p_odniz poruke"
+msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 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:932
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
-msgstr "Odjavi se sa izabrane fascikle"
+msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "Izbaci _smeÄe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 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:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -16127,157 +15909,154 @@ 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:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "N_iÅta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 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:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
-msgstr "Skupi celokupno grananje rasprava"
+msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 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:997
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
-msgstr "F_ilteri za poruke"
+msgstr "F_ilteri poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 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:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 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:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Prijavi se ili odjavi na fascikle na mreÅnim serverima"
+msgstr "Prijavite se ili se odjavite na fascikle na mreÅnim serverima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "Fas_cikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Show Message _Preview"
 msgstr "Prika_Åi pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
-msgstr "PrikaÅi pregled poruke"
+msgstr "PrikaÅite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
-#| msgid "Show deleted messages"
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Show _Deleted Messages"
 msgstr "PrikaÅi o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
-#, fuzzy
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 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:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
-msgstr "GrupiÅi po raspravama"
+msgstr "GrupiÅi po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 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:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 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:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "VaÅne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "Poruke nisu Äubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "ProÄitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "SkoraÅnje poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "NeproÄitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 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:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "tekuÄem nalogu"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "tekuÄoj fascikli"
 
-#: ../modules/mail/e-mail-shell-view-private.c:936
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -16286,7 +16065,7 @@ msgstr[1] "%d izabrane,"
 msgstr[2] "%d izabranih,"
 msgstr[3] "%d izabrana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:947
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -16295,17 +16074,17 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
-#: ../modules/mail/e-mail-shell-view-private.c:960
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d Äubre"
-msgstr[1] "%d Äubreta"
-msgstr[2] "%d Äubreta"
+msgstr[0] "%d nepoÅeljna"
+msgstr[1] "%d nepoÅeljne"
+msgstr[2] "%d nepoÅeljnih"
 msgstr[3] "%d Äubre"
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -16314,7 +16093,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16323,7 +16102,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16332,7 +16111,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16341,7 +16120,7 @@ msgstr[1] "%d neproÄitane,"
 msgstr[2] "%d neproÄitanih,"
 msgstr[3] "%d neproÄitana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16350,188 +16129,183 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:675
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:868
+#: ../modules/mail/e-mail-shell-view.c:928
 msgid "Proxy _Logout"
 msgstr "_Odjava sa mreÅnog posrednika"
 
-#: ../modules/mail/em-account-prefs.c:130
+#: ../modules/mail/em-account-prefs.c:133
 msgid "Evolution Account Assistant"
 msgstr "PomoÄnik naloga Evolucije"
 
-#: ../modules/mail/em-account-prefs.c:179
+#: ../modules/mail/em-account-prefs.c:182
 msgid "Account Editor"
 msgstr "UreÄivaÄ naloga"
 
 # has "activatable" set.
-#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/mail/em-composer-prefs.c:505
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "OmoguÄeno"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:509
 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:97
+#: ../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:98
+#: ../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:99
+#: ../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:100
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "jednom meseÄno"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:201
 msgid "Add Custom Junk Header"
 msgstr "Dodaje prilagoÄeno zaglavlje za neÅeljenu poÅtu"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:209
 msgid "Header Name:"
 msgstr "Naziv fascikle:"
 
-#: ../modules/mail/em-mailer-prefs.c:234
+#: ../modules/mail/em-mailer-prefs.c:210
 msgid "Header Value Contains:"
 msgstr "Vrednost zaglavlja sadrÅi:"
 
-#: ../modules/mail/em-mailer-prefs.c:334
+#: ../modules/mail/em-mailer-prefs.c:310
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:338
+#: ../modules/mail/em-mailer-prefs.c:314
 msgid "Contains Value"
 msgstr "SadrÅi vrednost"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
 #, c-format
 msgid "%s plugin is available and the binary is installed."
-msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
+msgstr "Dostupan je â%sâ dodatak i binarni oblik je instaliran."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
 #, 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."
+msgstr "Dodatak â%sâ nije dostupan. Proverite da li je paket instaliran."
 
-#: ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:751
 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:1167
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1168
+#: ../modules/mail/em-mailer-prefs.c:1144
 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:138
-#, fuzzy
-#| msgid "Do you want to make Evolution your default e-mail client?"
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 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/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"
+msgstr "Pitonov prikljuÄak testiranja"
 
 #: ../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."
+msgstr "PrikljuÄak testiranja za Pitonov pokretaÄ e-prikljuÄka"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:270
-#: ../widgets/misc/e-import-assistant.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../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:302
-#: ../widgets/misc/e-import-assistant.c:549
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
-#: ../modules/startup-wizard/evolution-startup-wizard.c:410
-#, fuzzy
-#| msgid "Importing files"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
 msgid "Importing Files"
-msgstr "UvoÅenje datoteka"
+msgstr "Uvozim datoteke"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
 msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr ""
+msgstr "UvoÅenje je otkazano. Kliknite âNapredâ da nastavite."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
 msgid "Import complete. Click \"Forward\" to continue."
-msgstr ""
+msgstr "UvoÅenje je obavljeno. Kliknite âNapredâ da nastavite."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
 msgid "Evolution Setup Assistant"
 msgstr "PomoÄnik podeÅavanja Evolucije"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
 msgid "Welcome"
-msgstr "Dobro doÅli"
+msgstr "DobrodoÅli"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 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. "
 
 #: ../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"
@@ -16546,7 +16320,7 @@ msgstr ""
 "tragati u telu poruke"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "KljuÄne reÄi"
 
@@ -16572,7 +16346,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."
@@ -16608,9 +16382,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:305
 msgid "_Restore Evolution from the backup file"
@@ -16629,130 +16403,123 @@ msgid "Restore from backup"
 msgstr "VraÄa iz rezervne kopije"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-#, fuzzy
-#| msgid "_Backup Settings..."
 msgid "_Backup Evolution Settings..."
-msgstr "_IzraÄuje rezervu postavki..."
+msgstr "_Napravi rezervu podeÅavanja Evolucije..."
 
 #: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
-msgstr "Pravi rezervu podataka i postavki Evolucije u arhivu"
+msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
 
 #: ../plugins/backup-restore/backup-restore.c:368
-#, fuzzy
-#| msgid "R_estore Settings..."
 msgid "R_estore Evolution Settings..."
-msgstr "Op_oravlja postavke..."
+msgstr "_Vrati podeÅavanja Evolucije..."
 
 #: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "Oporavlja podatke i postavke Evolucije iz arhive"
+msgstr "Vratite podatke i postavke Evolucije iz arhive"
 
-#: ../plugins/backup-restore/backup.c:63
+#: ../plugins/backup-restore/backup.c:80
 msgid "Backup Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraÄaj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:84
 msgid "Check Evolution Backup"
-msgstr "Proverava rezervnu kopiju Evolucije"
+msgstr "Proveri rezervnu kopiju Evolucije"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "Ponovo pokreÄe Evoluciju"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
-msgstr "Sa grafiÄkom okruÅenjem"
+msgstr "Sa grafiÄkim okruÅenjem"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "GaÅenje Evolucije"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:297
 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:202
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Izrada rezervne kopije podataka Evolucije (poÅta, kalendari, zadaci, beleÅke)"
 
-#: ../plugins/backup-restore/backup.c:213
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backup complete"
-msgstr "Izrada rezervne kopije zavrÅena"
+msgstr "Rezervna kopija je zavrÅena"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
-#: ../plugins/backup-restore/backup.c:255
-#, fuzzy
-#| msgid "Backup current Evolution data"
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
-msgstr "IzraÄuje rezervnu kopiju trenutnih podataka Evolucije"
+msgstr "Napravite rezervnu kopiju trenutnih podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:410
 msgid "Extracting files from backup"
 msgstr "Otpakivanje datoteka iz rezervne kopije"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
-msgstr "UÄitava podeÅavanja Evolucije"
+msgstr "UÄitavam podeÅavanja Evolucije"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:482
 msgid "Removing temporary backup files"
-msgstr "Uklanjanje privremenih rezervnih datoteka"
+msgstr "Uklanjanjam privremene rezervne datoteke"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
-msgstr "Osiguranje lokalnih izvora"
+msgstr "Nalazim lokalne izvore"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:679
 #, 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:433
+#: ../plugins/backup-restore/backup.c:684
 #, 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:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Backup"
 msgstr "Rezervna kopija Evolucije"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "PovraÄaj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "IzraÄuje rezervnu kopiju podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:748
 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:497
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "PovraÄaj podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:751
 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:516
+#: ../plugins/backup-restore/backup.c:769
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ovo moÅe potrajati, u zavisnosti od koliÄine podataka na nalogu."
 
@@ -16763,7 +16530,7 @@ msgstr "Izrada rezerve i oporavak"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup 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?"
@@ -16776,17 +16543,13 @@ 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 Backup Evolution"
-msgstr "Izaberite radnju:"
+msgstr "Zatvorite i napravite rezervu Evolucije"
 
 # 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"
@@ -16798,7 +16561,7 @@ msgstr "Neispravna datoteka rezervne kopije Evolucije"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
-msgstr "Izaberite ispravnu datoteku za povraÄaj"
+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."
@@ -16809,6 +16572,9 @@ msgid ""
 "To backup your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
+"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 ""
@@ -16817,6 +16583,10 @@ msgid ""
 "all your current Evolution data and settings and restore them from your "
 "backup."
 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:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16826,7 +16596,7 @@ msgstr "Automatski kontakti"
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:709
 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:715
 msgid "Select Address book for Automatic Contacts"
@@ -16834,18 +16604,16 @@ msgstr "Izaberi adresar za Automatske kontakte"
 
 #: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
-msgstr "Brze poruke"
+msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:745
-#, fuzzy
-#| msgid "Synchronize contact info and images from Pidgin buddy list"
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "UsklaÄuje podatke o kontaktima i slikama sa listom drugara u PidÅinu"
+msgstr "_UsklaÄuje slike i podatke kontakta sa listom drugara iz PidÅina"
 
 #: ../plugins/bbdb/bbdb.c:751
 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:762
@@ -16864,7 +16632,7 @@ 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."
@@ -16872,13 +16640,13 @@ msgstr ""
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter nije dostupan. Prvo ga instalirajte."
+msgstr "Bogofilter nije dostupan. Instalirajte ga prvo."
 
 #. 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:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "DoÅlo je do greÅke u pripremi %s: %s."
+msgstr "DoÅlo je do greÅke u pripremi â%sâ: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
@@ -16893,7 +16661,7 @@ msgstr "Äekanje na zavisan proces Bogofiltera ometeno, prekidam..."
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Cev ka Bogofilteru je pukla, oznaka greÅke: %d."
+msgstr "Spoj ka Bogofilteru je pao, oznaka greÅke: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
@@ -16921,15 +16689,15 @@ 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."
+msgstr "Filtrirajte neÅeljenu poÅtu koriÅÄenjem Bogofiltera."
 
 #: ../plugins/caldav/caldav-browse-server.c:197
 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:199
 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:203
 #, c-format
@@ -16938,12 +16706,12 @@ msgid ""
 "%d - %s"
 msgstr ""
 "Server je dao neoÄekivan odgovor.\n"
-"%d - %s"
+"%d â %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:333
 #: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
-msgstr "Neuspelo Äitanje odgovora servera."
+msgstr "Nisam uspeo da raÅÄlanim odgovor servera."
 
 #: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
@@ -16956,17 +16724,17 @@ msgstr "KorisniÄki kalendari"
 #: ../plugins/caldav/caldav-browse-server.c:557
 #: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
-msgstr "Neuspelo dobijanje adrese servera."
+msgstr "Nisam uspeo da dobijem adresu servera."
 
 #: ../plugins/caldav/caldav-browse-server.c:626
 #: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
-msgstr "TraÅenje korisniÄkih kalendara..."
+msgstr "TraÅim korisniÄke kalendare..."
 
 #: ../plugins/caldav/caldav-browse-server.c:665
 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:794
 #, c-format
@@ -16979,20 +16747,19 @@ msgid "Previous attempt failed with code %d"
 msgstr "Prethodni pokuÅaj nije uspeo, kod %d"
 
 #: ../plugins/caldav/caldav-browse-server.c:801
-#, 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:860
 #, 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:1095
 msgid "Searching folder content..."
-msgstr "TraÅenje sadrÅaja fascikle..."
+msgstr "PretraÅujem sadrÅaj fascikle..."
 
 #: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
@@ -17005,7 +16772,7 @@ msgstr "PodrÅke"
 #: ../plugins/caldav/caldav-browse-server.c:1254
 #, 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:1362
 #, c-format
@@ -17014,7 +16781,7 @@ msgstr "Adresa servera â%sâ nije ispravna"
 
 #: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
-msgstr "Traga za CalDAV kalendarom"
+msgstr "TraÅi KolDAV kalendar"
 
 #: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:100
@@ -17024,7 +16791,7 @@ msgstr "_Adresa :"
 #: ../plugins/caldav/caldav-source.c:223
 #: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
-msgstr "Koristi Åifrovanu vezu"
+msgstr "Koristi _SSL"
 
 #: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
@@ -17041,11 +16808,11 @@ 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:125
 msgid "_Customize options"
@@ -17065,7 +16832,7 @@ msgstr "Pri otvaranju"
 
 #: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
-msgstr "Kod izmene datoteke"
+msgstr "Pri izmeni datoteke"
 
 # Create the default Person calendar
 # Create the default Person task list
@@ -17076,11 +16843,11 @@ msgstr "PeriodiÄno"
 
 #: ../plugins/calendar-file/calendar-file.c:213
 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"
@@ -17096,7 +16863,7 @@ 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"
@@ -17168,7 +16935,7 @@ msgstr "Imperijalne (Farenhajt, inÄi, itd.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Add weather calendars to Evolution."
-msgstr "Dodaje kalendare za vreme u Evoluciju."
+msgstr "Dodajte kalendare za vreme u Evoluciju."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
@@ -17185,41 +16952,31 @@ msgstr "Prikazuje kartu svih kontakata"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
-msgstr "Dodaje kartu sa lokacijom kontakta, kada je moguÄe."
+msgstr "Dodajte kartu sa lokacijom kontakta, kada je moguÄe."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
 msgid "Map for contacts"
 msgstr "Karta za kontakte"
 
 #: ../plugins/dbx-import/dbx-importer.c:232
-#, fuzzy
-#| msgid "Select folder to import into"
 msgid "Select folder to import OE folder into"
-msgstr "Izaberite fasciklu za uvoz"
+msgstr "Izaberite fasciklu za uvoz OE fascikle"
 
 #: ../plugins/dbx-import/dbx-importer.c:251
-#, 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:83
 msgid "Mark as _default address book"
@@ -17227,7 +16984,7 @@ msgstr "OznaÄava kao _podrazumevan adresar"
 
 #: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
-msgstr "Samo_dopuni ovim adresarom"
+msgstr "Sam _dopunjava ovim adresarom"
 
 #: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
@@ -17276,13 +17033,13 @@ msgid "Protected"
 msgstr "ZaÅtiÄeno"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "Tajno"
 
 #: ../plugins/email-custom-header/email-custom-header.c:325
 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.
@@ -17314,14 +17071,14 @@ msgid "Key"
 msgstr "KljuÄ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 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"
@@ -17334,12 +17091,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:126
 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"
@@ -17376,7 +17133,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"
@@ -17400,7 +17157,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 ""
@@ -17412,7 +17169,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 ""
@@ -17432,7 +17189,7 @@ msgstr "Datoteke slika"
 
 #: ../plugins/face/face.c:355
 msgid "_Insert Face picture by default"
-msgstr "_Umetni sliku kontakta podrazumevano"
+msgstr "_Unapred umetni sliku kontakta"
 
 #: ../plugins/face/face.c:366
 msgid "Load new _Face picture"
@@ -17468,20 +17225,19 @@ 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:274
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
-#, fuzzy
-#| msgid "_Server:"
 msgid "Server"
-msgstr "S_erver:"
+msgstr "Server"
 
 #: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
-"Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
+"Unesite lozinku za korisnika â%sâ radi pristupa listi prijavljenih kalendara."
 
 #: ../plugins/google-account-setup/google-source.c:548
 #, c-format
@@ -17489,12 +17245,12 @@ 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:548
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:953
 msgid "Unknown error."
 msgstr "Nepoznata greÅka."
 
@@ -17503,18 +17259,16 @@ msgid "Cal_endar:"
 msgstr "Kal_endar:"
 
 #: ../plugins/google-account-setup/google-source.c:669
-#, fuzzy
-#| msgid "Retrieve _list"
 msgid "Retrieve _List"
 msgstr "Dovuci _listu"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 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/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
@@ -17549,7 +17303,7 @@ msgid "Rese_nd Meeting..."
 msgstr "Ponovo _Åalji sastanak..."
 
 #: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Create folder"
 msgstr "Napravi fasciklu"
 
@@ -17567,9 +17321,9 @@ msgid ""
 "Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
-"Korisnik â%sâ je sa Vama podelio fasciklu\n"
+"Korisnik â%sâ je sa vama podelio fasciklu\n"
 "\n"
-"Poruka od â%sâ\n"
+"Poruku Åalje â%sâ\n"
 "\n"
 "\n"
 "%s\n"
@@ -17626,7 +17380,7 @@ msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
-"PovlaÄenje poruke je moÅe ukloniti iz sanduÄeta primaoca. Åelite li ovo da "
+"PovlaÄenjem poruke moÅete je ukloniti iz sanduÄeta primaoca. Åelite li ovo da "
 "uradite? "
 
 #: ../plugins/groupwise-features/mail-retract.c:111
@@ -17639,15 +17393,15 @@ msgstr "UmeÄe opcije slanja"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
-msgstr "Dodaj opcije slanja GroupWise porukama"
+msgstr "Dodaj opcije slanja porukama GroupVjza"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "Fine-tune your GroupWise accounts."
-msgstr "Fino podesite naloge GroupWise."
+msgstr "Fino podesite naloge GroupVajza."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
-msgstr "GroupWise moguÄnosti"
+msgstr "MoguÄnosti GroupVajza"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
@@ -17659,7 +17413,7 @@ msgstr "Server nije dozvolio povlaÄenje izabrane poruke."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Nalog imena &quot;{0}&quot; veÄ postoji. Proverite stablo fascikli."
+msgstr "Nalog â{0}â veÄ postoji. Proverite stablo fascikli."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
 msgid "Account Already Exists"
@@ -17676,15 +17430,15 @@ msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
 msgstr ""
-"Prijava na posrednika kao &quot;{0}&quot; nije bila uspeÅna. Proverite "
-"adresu e-poÅte i pokuÅajte ponovo."
+"Prijava na posrednika kao â{0}â nije bila uspeÅna. Proverite adresu e-poÅte "
+"i pokuÅajte ponovo."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Korisniku &quot;{0}&quot; ne moÅe biti dodeljen pristup posredniku"
+msgstr "Korisniku â{0}â ne moÅe biti dodeljen pristup posredniku"
 
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
@@ -17704,8 +17458,7 @@ msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
-"Ne moÅete podeliti ovu fasciklu sa navedenim korisnikom user &quot;{0}&quot;"
+msgstr "Ne moÅete podeliti ovu fasciklu sa navedenim korisnikom â{0}â"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
@@ -17771,10 +17524,8 @@ msgid "The participants will receive the following notification.\n"
 msgstr "UÄesnici Äe primiti sledeÄe obaveÅtenje.\n"
 
 #: ../plugins/groupwise-features/properties.ui.h:9
-#, fuzzy
-#| msgid "Users"
 msgid "Users:"
-msgstr "Korisnici"
+msgstr "Korisnici:"
 
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
@@ -17835,7 +17586,7 @@ msgid "Proxy"
 msgstr "MreÅni posrednik"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:230
 msgid "Account Name"
 msgstr "Ime naloga"
 
@@ -17855,18 +17606,16 @@ msgstr "%sUnesite lozinku za %s (korisnik %s)"
 #: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
-"JeziÄak za mreÅnog posrednika Äe biti dostupan samo kada nalog bude na mreÅi."
+"JeziÄak mreÅnog posrednika Äe biti dostupan samo kada nalog bude na mreÅi."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
-"JeziÄak za mreÅnog posrednika Äe biti dostupan samo kada nalog bude omoguÄen."
+"JeziÄak mreÅnog posrednika Äe biti dostupan samo kada nalog bude omoguÄen."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:700
-#, fuzzy
-#| msgid "Proxy"
 msgctxt "GW"
 msgid "Proxy"
 msgstr "MreÅni posrednik"
@@ -17874,22 +17623,22 @@ msgstr "MreÅni posrednik"
 #: ../plugins/groupwise-features/proxy.c:926
 #: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
-msgstr "Dodaje korisnika"
+msgstr "Dodaj korisnika"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Napredne opcije slanja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder-common.c:310
 #: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:311
 msgid "Enter the users and set permissions"
 msgstr "Unesite korisnike i postavite ovlaÅÄenja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:407
 msgid "Sharing"
 msgstr "Deljenje"
 
@@ -17901,6 +17650,10 @@ msgstr "PrilagoÄeno obaveÅtenje"
 msgid "Add   "
 msgstr "Dodaj "
 
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "Izmeni"
+
 #: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Status poruke"
@@ -17956,7 +17709,7 @@ 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 direktno u porukama."
+msgstr "Pregledajte priloge sa slikama direktno u porukama."
 
 #: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
@@ -17995,7 +17748,7 @@ msgid ""
 "_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
@@ -18013,10 +17766,9 @@ 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:485
-#, 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:649
 #, c-format
@@ -18026,184 +17778,186 @@ msgstr "Jedno zakazivanje u kalendaru â%sâ je u isto vreme kad i ovaj sastan
 #: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "Zakazivanje je pronaÄeno u kalendaru â%sâ"
+msgstr "PronaÅao sam zakazivanje u kalendaru â%sâ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:784
 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:791
 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:795
 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:799
 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:873
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Opening the calendar. Please wait.."
-msgstr "Otvaranje kalendara. SaÄekajte..."
+msgstr "Otvaram kalendar. SaÄekajte..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:878
 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:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1059
 msgid "Unable to parse item"
-msgstr "Nije moguÄa obrada stavke"
+msgstr "Ne mogu da obradim stavku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru â%sâ kao prihvaÄeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 #, 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:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru â%sâ kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1172
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru â%sâ kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 #, 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:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveÅtenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 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:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 #, 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:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Attendee status updated"
 msgstr "Status uÄesnika je aÅuriran"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Meeting information sent"
-msgstr "Podatak o sastanku poslat"
+msgstr "Podatak o sastanku je poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Task information sent"
-msgstr "Podatak o zadatku poslat"
+msgstr "Podatak o zadatku je poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Memo information sent"
-msgstr "Podatak o beleÅci poslat"
+msgstr "Podatak o beleÅci je poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 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:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 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:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1466
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1536
 msgid "Save Calendar"
 msgstr "SaÄuvaj kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid "The calendar attached is not valid"
 msgstr "PriloÅen kalendar nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 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:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1778
 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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrÅi viÅe stavki"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1683
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 "Radi obrade svih ovih stavki, potrebno je datoteku saÄuvati a kalendar uvesti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2456
 msgid "This meeting recurs"
-msgstr "Ovaj se sastanak ponavlja"
+msgstr "Ovaj sastanak se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2455
+#: ../plugins/itip-formatter/itip-formatter.c:2459
 msgid "This task recurs"
-msgstr "Ovaj se zadatak se ponavlja"
+msgstr "Ovaj zadatak se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2458
+#: ../plugins/itip-formatter/itip-formatter.c:2462
 msgid "This memo recurs"
-msgstr "Ova se beleÅka ponavlja"
+msgstr "Ova beleÅka se ponavlja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "_Delete message after acting"
 msgstr "_ObriÅi poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2702
-#: ../plugins/itip-formatter/itip-formatter.c:2735
+#: ../plugins/itip-formatter/itip-formatter.c:2706
+#: ../plugins/itip-formatter/itip-formatter.c:2739
 msgid "Conflict Search"
-msgstr "Tabela pretrage za preklapanjima"
+msgstr "Pretraga preklapanja"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2721
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
@@ -18211,44 +17965,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
@@ -18352,279 +18106,222 @@ msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 #: ../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:"
@@ -18653,7 +18350,7 @@ msgstr "Vreme zavrÅetka:"
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
-msgstr "_Otvori kalendar"
+msgstr "O_tvori kalendar"
 
 #: ../plugins/itip-formatter/itip-view.c:849
 #: ../plugins/itip-formatter/itip-view.c:853
@@ -18668,10 +18365,8 @@ msgstr "_Odbij"
 #: ../plugins/itip-formatter/itip-view.c:862
 #: ../plugins/itip-formatter/itip-view.c:878
 #: ../plugins/itip-formatter/itip-view.c:883
-#, fuzzy
-#| msgid "Accept"
 msgid "A_ccept"
-msgstr "Prihvati"
+msgstr "_Prihvati"
 
 #: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
@@ -18689,8 +18384,6 @@ msgid "_Tentative"
 msgstr "Sa _rezervom"
 
 #: ../plugins/itip-formatter/itip-view.c:855
-#, fuzzy
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "P_rihvati sve"
 
@@ -18756,14 +18449,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"
@@ -18776,94 +18463,86 @@ 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 "Blink icon in notification area."
-msgstr "TrepÄuÄa ikona u obaveÅtajnoj zoni."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
-msgstr "UkljuÄuje poruke D-Bus."
+msgstr "UkljuÄuje D-bas poruke."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../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."
+msgstr "UkljuÄuje ikonu u obaveÅtajnoj zoni."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../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."
+msgstr "Stvara D-bas poruku kada stigne nova poÅta."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 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:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 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:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 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:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 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:10
+#: ../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:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 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:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Ime datoteke za puÅtanje."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 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:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "Koristi zvuk teme"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 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:16
+#: ../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:17
-msgid "Whether the icon should blink or not."
-msgstr "Da li da ikona trepÄe ili ne."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 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:369
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "Evolucijino obaveÅtenje o poÅti"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "PodeÅavanja obaveÅtenja o poÅti"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18886,19 +18565,19 @@ msgstr[3] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
-msgstr "Od: %s"
+msgstr "Åalje: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:542
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18907,50 +18586,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:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "Nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
-msgstr "Prikazuje ikonu u _obaveÅtajnoj zoni"
-
-#: ../plugins/mail-notification/mail-notification.c:680
-msgid "B_link icon in notification area"
-msgstr "Tre_peri ikona u obaveÅtajnoj zoni "
+msgstr "PrikaÅi ikonu u _obaveÅtajnoj zoni"
 
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "PrikaÅi _poruku zajedno sa ikonom"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "_Pusti zvuk kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
-msgstr "_Svirni"
+msgstr "_ZapiÅti"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "Pusti _zvuÄnu datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
-msgstr "Bira zvuÄnu datoteku"
+msgstr "Izaberite zvuÄnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _SanduÄe"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
-msgstr "Stvara _D-Bus poruku"
+msgstr "Stvara _D-bas poruku"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18958,7 +18633,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:158
@@ -18966,7 +18641,7 @@ msgstr "ObaveÅtava Vas kada stigne nova poruka."
 msgid "Created from a mail by %s"
 msgstr "SaÄinjeno iz poruke koju Åalje %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18975,7 +18650,7 @@ msgstr ""
 "Izabrani kalendar veÄ sadrÅi dogaÄaj â%sâ. Åelite li da uredite stari "
 "dogaÄaj?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18983,7 +18658,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak veÄ sadrÅi zadatak â%sâ. Åelite li da uredite stari zadatak?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18994,7 +18669,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -19005,7 +18680,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -19016,7 +18691,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -19027,7 +18702,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -19050,7 +18725,7 @@ msgstr[3] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -19073,7 +18748,7 @@ msgstr[3] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -19093,139 +18768,139 @@ msgstr[3] ""
 "Izabrani spisak veÄ sadrÅi beleÅku za datu poruku. Åelite li ipak da "
 "napravite novu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Bez saÅetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 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:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, 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:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, 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:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 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:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 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:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 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:952
+#: ../plugins/mail-to-task/mail-to-task.c:953
 #, 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:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1072
 msgid "Create an _Event"
 msgstr "Napravi _dogaÄaj"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 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:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a Mem_o"
 msgstr "Napravi beleÅk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 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:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 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:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1096
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 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."
 msgstr "Pretvara poruku u zadatak."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 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:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _koriÅÄenju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 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:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Javite se vlasniku dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "_PoÅalji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 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:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 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:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
-msgstr "O_djavi se liste"
+msgstr "O_djavi se sa liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 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:330
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -19276,7 +18951,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 ""
@@ -19285,7 +18960,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}"
@@ -19316,7 +18991,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Äi takoÄe i poruke u podfasciklama?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
@@ -19326,16 +19001,16 @@ msgstr ""
 "Åelite li da oznaÄite poruke kao proÄitane samo u trenutnoj fascikli, ili i "
 "one u podfasciklama? "
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "U trenutnoj fascikli i _podfasciklama"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:439
 msgid "Mark Me_ssages as Read"
 msgstr "OznaÄi po_ruke kao proÄitane"
 
@@ -19394,31 +19069,31 @@ msgstr "Prednost daje tekstu"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Pregleda poruke kao obiÄan tekst, Äak i ako sadrÅe HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Show HTML if present"
 msgstr "PrikaÅi HTML ako postoji"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 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:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text if present"
 msgstr "PrikaÅi obiÄan tekst ako postoji"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 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:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Only ever show plain text"
 msgstr "IskljuÄivo prikazuj obiÄan tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19426,11 +19101,11 @@ msgstr ""
 "Uvek prikazuje deo sa obiÄnim tekstom, prilaÅuÄi ostale delove u poruku, po "
 "izboru."
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:257
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "PrikaÅi po_tisnute HTML delove kao priloge"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:277
 msgid "HTML _Mode"
 msgstr "HTML _reÅim"
 
@@ -19444,15 +19119,15 @@ msgstr "DogaÄaji profila podataka u Evoluciji (samo za programere)."
 
 #: ../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:295
 msgid "_Mail"
@@ -19480,11 +19155,11 @@ msgstr "_Zadaci"
 #. Journal
 #: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
-msgstr "Unosi u _dnevnik"
+msgstr "Unosi _dnevnika"
 
 #: ../plugins/pst-import/pst-importer.c:347
 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
@@ -19498,33 +19173,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:208
 #: ../plugins/publish-calendar/publish-calendar.c:449
 #, 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:210
 #, 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:230
 #, 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:232
 #, 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:276
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "Neuspelo montiranje %s:"
+msgstr "Nisam uspeo da montiram %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:596
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
@@ -19540,7 +19215,7 @@ msgstr "Sigurno Åelite da uklonite ovu lokaciju?"
 #. ever happen, and if so, then something is really wrong.
 #: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
-msgstr "Nije moguÄe objaviti raspravu."
+msgstr "Ne mogu da objavim raspravu."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
@@ -19584,7 +19259,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:"
@@ -19600,7 +19275,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"
@@ -19632,19 +19307,19 @@ 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:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, 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:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "Nova lokacija"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "Uredi lokaciju"
 
@@ -19657,27 +19332,27 @@ msgstr "Ubica spama nije pronaÄen, kod: %d"
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
-msgstr "Nije uspelo pravljenje cevi: %s"
+msgstr "Nisam uspeo da napravim spoj: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
-msgstr "GreÅka po izdvajanju: %s"
+msgstr "GreÅka nakon izdvajanja: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "Zavisan proces Ubici spama nije odgovorio, ubijam..."
+msgstr "Zavisan proces Ubice spama nije odgovorio, ubijam..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "Äekanje na zavisan proces Ubice spama ometeno, prekidam..."
+msgstr "Äekanje na zavisan proces Ubice spama je ometeno, prekidam..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Cev ka Ubici spama je pukla, oznaka greÅke: %d"
+msgstr "Spoj ka Ubici spama se prekinuo, oznaka greÅke: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
@@ -19694,7 +19369,7 @@ 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."
+msgstr "Filtrirajte 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"
@@ -19758,7 +19433,7 @@ msgstr "Izmenjeno"
 
 #: ../plugins/save-calendar/csv-format.c:530
 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:537
 msgid "Prepend a _header"
@@ -19831,7 +19506,7 @@ msgstr "Razvrstava poruke u raspravi prema naslovu."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "Razvrstavanje poruka po naslovu rasprave"
+msgstr "Razvrstavanje prema naslovu rasprave"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
@@ -19854,21 +19529,21 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "PrikljuÄak za obrazac nacrta"
 
-#: ../plugins/templates/templates.c:616
+#: ../plugins/templates/templates.c:627
 msgid "No Title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:687
+#: ../plugins/templates/templates.c:722
 msgid "Save as _Template"
 msgstr "SaÄuvaj kao _Åablon"
 
-#: ../plugins/templates/templates.c:689
+#: ../plugins/templates/templates.c:724
 msgid "Save as Template"
 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"
@@ -19882,43 +19557,43 @@ msgstr "UgnjeÅdene vKarte"
 msgid "Show vCards directly in mail messages."
 msgstr "Prikazuje vKarte neposredno u porukama."
 
-#: ../plugins/vcard-inline/vcard-inline.c:164
-#: ../plugins/vcard-inline/vcard-inline.c:249
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "PrikaÅi punu vKartu"
 
-#: ../plugins/vcard-inline/vcard-inline.c:167
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "PrikaÅi saÅetu vKartu"
 
-#: ../plugins/vcard-inline/vcard-inline.c:228
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "Postoji joÅ jedan kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:237
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, 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:258
+#: ../plugins/vcard-inline/vcard-inline.c:275
 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:68
 msgid "WebDAV"
-msgstr "WebDAV"
+msgstr "VebDAV"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
@@ -19926,7 +19601,7 @@ msgstr "Adresa :"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Izbegavaj IfMatch (potrebno na ApaÄu < 2.2.8)"
+msgstr "_Izbegavaj Ako poklapa (potrebno na ApaÄu < 2.2.8)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
@@ -19942,7 +19617,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"
@@ -19972,7 +19647,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
@@ -19981,19 +19656,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."
@@ -20006,10 +19681,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"
@@ -20021,15 +19696,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"
@@ -20046,27 +19721,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 ""
@@ -20075,21 +19750,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:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:341
 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"
@@ -20113,15 +19788,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 ""
@@ -20133,15 +19808,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 ""
@@ -20149,7 +19824,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 ""
@@ -20157,7 +19832,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 ""
@@ -20165,7 +19840,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 ""
@@ -20199,11 +19874,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."
+msgstr "KorisniÄko ime za potvrÄivanje identiteta prilikom HTTP posredovanja."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -20211,30 +19886,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"
@@ -20244,11 +19919,11 @@ msgstr "Stil dugmadi prozora"
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
-#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../shell/e-shell-content.c:563
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "SaÄuvaj pretragu"
 
@@ -20256,19 +19931,19 @@ msgstr "SaÄuvaj pretragu"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:921
+#: ../shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "Prika_Åi: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:952
+#: ../shell/e-shell-searchbar.c:960
 msgid "Sear_ch:"
 msgstr "P_retraÅi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1013
+#: ../shell/e-shell-searchbar.c:1021
 msgid "i_n"
 msgstr " _u "
 
@@ -20322,15 +19997,15 @@ msgstr "_SadrÅaj"
 
 #: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
-msgstr "Otvori Evolucijino korisniÄko uputstvo"
+msgstr "Otvorite korisniÄko uputstvo Evolucije"
 
 #: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
-msgstr "PomoÄ za Evoluciju"
+msgstr "Pomo_Ä za Evoluciju"
 
 #: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
-msgstr "Otvara veb stranicu sa Äesto postavljanim pitanjima"
+msgstr "Otvorite veb stranicu sa Äesto postavljanim pitanjima"
 
 #: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
@@ -20338,7 +20013,7 @@ msgstr "Zaboravi _lozinke"
 
 #: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
-msgstr "Zaboravi sve zapamÄene lozinke"
+msgstr "Zaboravite sve zapamÄene lozinke"
 
 #: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
@@ -20346,7 +20021,7 @@ msgstr "_Uvezi..."
 
 #: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
-msgstr "Uvezi podatke iz drugih programa"
+msgstr "Uvezite podatke iz drugih programa"
 
 #: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
@@ -20354,7 +20029,7 @@ msgstr "Nov p_rozor"
 
 #: ../shell/e-shell-window-actions.c:1496
 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:1510
 msgid "Configure Evolution"
@@ -20362,15 +20037,15 @@ msgstr "Podesi Evoluciju"
 
 #: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
-msgstr "_Kratki podsetnik"
+msgstr "_Kratak podsetnik"
 
 #: ../shell/e-shell-window-actions.c:1517
 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:1524
 msgid "Exit the program"
-msgstr "Izlazak iz programa"
+msgstr "IzaÄite iz programa"
 
 #: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
@@ -20378,11 +20053,11 @@ msgstr "_Napredna pretraga..."
 
 #: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
-msgstr "Obrazuj napredniju pretragu"
+msgstr "Obrazujte napredniju pretragu"
 
 #: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
-msgstr "OÄisti trenutne parametre pretrage"
+msgstr "OÄistite parametre trenutne pretrage"
 
 #: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
@@ -20390,7 +20065,7 @@ msgstr "_Uredi saÄuvane pretrage..."
 
 #: ../shell/e-shell-window-actions.c:1545
 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:1552
 msgid "Click here to change the search type"
@@ -20403,7 +20078,7 @@ msgstr "Pro_naÄi sada"
 #. Block the default Ctrl+F.
 #: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
-msgstr "IzvrÅi trenutne parametre pretrage"
+msgstr "IzvrÅite parametre trenutne pretrage"
 
 #: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
@@ -20411,15 +20086,15 @@ msgstr "_SaÄuvaj pretragu..."
 
 #: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
-msgstr "SaÄuvaj trenutne parametre pretrage"
+msgstr "SaÄuvajte parametre trenutne pretrage"
 
 #: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
-msgstr "Slanje / p_rimanje"
+msgstr "PoÅalji / p_rimi"
 
 #: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
-msgstr "Åalje pripremljene i dovlaÄi nove stavke"
+msgstr "PoÅaljite pripremljene i dovucite nove stavke"
 
 #: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
@@ -20427,7 +20102,7 @@ msgstr "PoÅalji izveÅtaj o _greÅci..."
 
 #: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
-msgstr "PoÅalji izveÅtaj o greÅci BubaÅdajinim pomoÄnikom"
+msgstr "PoÅaljite izveÅtaj o greÅci BubaÅdajinim pomoÄnikom"
 
 #: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
@@ -20435,7 +20110,7 @@ msgstr "Ra_d van mreÅe"
 
 #: ../shell/e-shell-window-actions.c:1594
 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:1599
 msgid "_Work Online"
@@ -20443,7 +20118,7 @@ msgstr "_Rad na mreÅi"
 
 #: ../shell/e-shell-window-actions.c:1601
 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:1629
 msgid "Lay_out"
@@ -20467,11 +20142,11 @@ msgstr "Pro_zor"
 
 #: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
-msgstr "PrikaÅi boÄnu _traku"
+msgstr "PrikaÅi _boÄnu povrÅ"
 
 #: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
-msgstr "PrikaÅi boÄnu traku"
+msgstr "PrikaÅite boÄnu povrÅ"
 
 #: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
@@ -20479,15 +20154,15 @@ msgstr "PrikaÅi _dugmad"
 
 #: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
-msgstr "PrikaÅi dugmad prebacivaÄa"
+msgstr "PrikaÅite dugmad prebacivaÄa"
 
 #: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
-msgstr "PrikaÅi traku _statusa"
+msgstr "PrikaÅi traku _stanja"
 
 #: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
-msgstr "PrikaÅi traku statusa"
+msgstr "PrikaÅite traku stanja"
 
 #: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
@@ -20495,15 +20170,15 @@ msgstr "PrikaÅi traku _alata"
 
 #: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
-msgstr "PrikaÅi traku alata"
+msgstr "PrikaÅite traku alata"
 
 #: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
-msgstr "Samo _ikone"
+msgstr "Samo _ikonice"
 
 #: ../shell/e-shell-window-actions.c:1743
 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:1748
 msgid "_Text Only"
@@ -20511,15 +20186,15 @@ msgstr "Samo _tekst"
 
 #: ../shell/e-shell-window-actions.c:1750
 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:1755
 msgid "Icons _and Text"
-msgstr "Ikone _i tekst"
+msgstr "Ikonice _i tekst"
 
 #: ../shell/e-shell-window-actions.c:1757
 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:1762
 msgid "Tool_bar Style"
@@ -20527,8 +20202,7 @@ msgstr "Stil tra_ke alata"
 
 #: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Prikazuje dugmad prozora koriÅÄenjem postavke treake alata radne povrÅine"
+msgstr "PrikaÅite dugmad prozora koristeÄi podeÅavanja trake alata radne povrÅi"
 
 #: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
@@ -20536,7 +20210,7 @@ msgstr "Odredi preglede..."
 
 #: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
-msgstr "Pravi ili menja preglede"
+msgstr "Napravite ili izmenite preglede"
 
 #: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
@@ -20544,7 +20218,7 @@ msgstr "SaÄuvaj prilagoÄen pregled..."
 
 #: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
-msgstr "Äuva trenutni korisniÄki pregled"
+msgstr "SaÄuvajte trenutni korisniÄki pregled"
 
 #: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
@@ -20556,11 +20230,11 @@ msgstr "PrilagoÄen pregled"
 
 #: ../shell/e-shell-window-actions.c:1800
 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:1810
 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:2183
 #, c-format
@@ -20569,32 +20243,32 @@ msgstr "PreÄi na %s"
 
 #: ../shell/e-shell-window-actions.c:2396
 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:576
 #, c-format
 msgid "%s - Evolution"
-msgstr "%s - Evolucija"
+msgstr "%s â Evolucija"
 
-#: ../shell/e-shell-window.c:416
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell.c:226
+#: ../shell/e-shell.c:244
 msgid "Preparing to go offline..."
-msgstr "Priprema za rad van mreÅe..."
+msgstr "Pripremam se za rad van mreÅe..."
 
-#: ../shell/e-shell.c:276
+#: ../shell/e-shell.c:294
 msgid "Preparing to go online..."
-msgstr "Priprema za rad na mreÅi..."
+msgstr "Pripremam se za rad na mreÅi..."
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:353
 msgid "Preparing to quit..."
-msgstr "Priprema za kraj..."
+msgstr "Pripremam se da izaÄem..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20627,9 +20301,9 @@ 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:204
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20637,63 +20311,63 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:221
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reÄi"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:337
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:339
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:343
 msgid "Start in online mode"
 msgstr "PoÄni rad na mreÅi"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:345
 msgid "Start in \"express\" mode"
 msgstr "PoÄni u âekspresnomâ reÅimu"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:348
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:351
 msgid "Send the debugging output of all components to a file."
 msgstr "PoÅalji izlaz o greÅkama iz svih delova u datoteku."
 
-#: ../shell/main.c:343
+#: ../shell/main.c:353
 msgid "Disable loading of any plugins."
-msgstr "OnemoguÄava uÄitavanje svih dodataka."
+msgstr "IskljuÄi uÄitavanje svih dodataka."
 
-#: ../shell/main.c:345
+#: ../shell/main.c:355
 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:349
+#: ../shell/main.c:359
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Uvezi adrese datoteka datih kao ostatak argumenata."
 
 # shell:noshell-reason title
-#: ../shell/main.c:351
+#: ../shell/main.c:361
 msgid "Request a running Evolution process to quit"
-msgstr "Zahtevaj kraj pokrenutog procesa Evolucije"
+msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:505 ../shell/main.c:513
 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:545
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
-"%s: --online i --offline se ne mogu koristiti zajedno.\n"
-"  Koristite %s --help za viÅe podataka.\n"
+"%s: â--onlineâ i â--offlineâ se ne mogu koristiti zajedno.\n"
+"  Koristite â%s --helpâ za viÅe podataka.\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -20701,16 +20375,12 @@ msgstr "Sigurno Åelite da sve zapamÄene lozinke budu zaboravljene?"
 
 # shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
-#| msgid "Delete old data from version {0}?"
 msgid "Cannot upgrade directly from version {0}"
-msgstr "Obrisati stare podatke iz verzije {0}?"
+msgstr "Ne mogu direktno da nadogradim sa izdanja {0}"
 
 #: ../shell/shell.error.xml.h:3
-#, fuzzy
-#| msgid "Continue"
 msgid "Continue Anyway"
-msgstr "Nastavi"
+msgstr "Ipak nastavi"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
@@ -20718,6 +20388,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 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 ""
@@ -20728,14 +20401,12 @@ msgstr ""
 "upitani kada sledeÄi put budu bile potrebne."
 
 #: ../shell/shell.error.xml.h:7
-#, fuzzy
-#| msgid "Quit"
 msgid "Quit Now"
 msgstr "IzaÄi"
 
 #: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
-msgstr "Neuspela nadogradnja sa prethodne verzije:"
+msgstr "Neuspela nadogradnja sa prethodnog izdanja:"
 
 #: ../shell/shell.error.xml.h:9
 msgid "_Forget"
@@ -20760,7 +20431,7 @@ msgstr "_Probna stavka"
 
 #: ../shell/test/e-test-shell-backend.c:62
 msgid "Create a new test item"
-msgstr "Napravi novu probnu stavku"
+msgstr "Napravite novu probnu stavku"
 
 #: ../shell/test/e-test-shell-backend.c:70
 msgctxt "New"
@@ -20769,7 +20440,7 @@ msgstr "Probni _izvor"
 
 #: ../shell/test/e-test-shell-backend.c:72
 msgid "Create a new test source"
-msgstr "Napravi novi probni izvor"
+msgstr "Napravite novi probni izvor"
 
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
@@ -20784,7 +20455,7 @@ msgstr "Neprepoznatljiva verzija datoteke desktop â%sâ"
 #: ../smclient/eggdesktopfile.c:958
 #, c-format
 msgid "Starting %s"
-msgstr "Pokretanje %s"
+msgstr "PokreÄem %s"
 
 #: ../smclient/eggdesktopfile.c:1100
 #, c-format
@@ -20799,7 +20470,7 @@ msgstr "Neprepoznatljiva opcija uÄitavanja: %d"
 #: ../smclient/eggdesktopfile.c:1373
 #, 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:1394
 #, c-format
@@ -20841,7 +20512,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"Sertifikat â%sâ je CA sertifikat.\n"
+"Uverenje â%sâ je CA uverenje.\n"
 "\n"
 "Uredite postavke poverenja:"
 
@@ -20851,8 +20522,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 ""
@@ -20860,14 +20531,14 @@ 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:148
 #: ../smime/gui/certificate-manager.c:460
 #: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
-msgstr "Izaberite sertifikat za uvoz..."
+msgstr "Izaberite uverenje za uvoz..."
 
 #: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
@@ -20880,16 +20551,14 @@ msgid "All files"
 msgstr "Sve datoteke"
 
 #: ../smime/gui/certificate-manager.c:182
-#, fuzzy
-#| msgid "Imported Certificate"
 msgid "Failed to import user's certificate"
-msgstr "UveÅen sertifikat"
+msgstr "Nisam uspeo da uvezem uverenje korisnika"
 
 #: ../smime/gui/certificate-manager.c:352
 #: ../smime/gui/certificate-manager.c:574
 #: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
-msgstr "Ime sertifikata"
+msgstr "Ime uverenja"
 
 #: ../smime/gui/certificate-manager.c:361
 #: ../smime/gui/certificate-manager.c:592
@@ -20907,41 +20576,38 @@ msgstr "IstiÄe"
 
 #: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
-msgstr "Sve datoteke sertifikata poÅte"
+msgstr "Sve datoteke uverenja poÅte"
 
 #: ../smime/gui/certificate-manager.c:502
-#, fuzzy
-#| msgid "Failed to delete contact"
 msgid "Failed to import contact's certificate"
-msgstr "Neuspelo brisanje kontakta"
+msgstr "Nisam uspeo da uvezem uverenje kontakta"
 
 #: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
-msgstr "Elektronska adresa"
+msgstr "Adresa e-poÅte"
 
 #: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
-msgstr "Sve datoteke CA sertifikata"
+msgstr "Sve datoteke CA uverenja"
 
 #: ../smime/gui/certificate-manager.c:737
 msgid "Failed to import certificate authority's certificate"
-msgstr ""
+msgstr "Nisam uspeo da uvezem uverenje izdavaÄa uverenja"
 
 #: ../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"
@@ -20954,7 +20620,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
@@ -20963,58 +20629,56 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
-"Izdao:\n"
+"Izdao je:\n"
 "  Naslov: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:167
 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:1086
 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)"
@@ -21022,23 +20686,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"
@@ -21054,15 +20718,15 @@ msgstr "Otisci"
 
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
-msgstr "Izdato od"
+msgstr "IzdavaÄ"
 
 #: ../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:26
 msgid "MD5 Fingerprint"
@@ -21082,33 +20746,31 @@ msgstr "SHA1 otisak"
 
 #: ../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"
@@ -21116,34 +20778,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"
 
-#: ../smime/gui/smime-ui.ui.h:43
-#, fuzzy
-#| msgid "Backup"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
-msgstr "Rezerva"
+msgstr "Napravi _rezervu"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../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"
@@ -21160,19 +20821,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"
@@ -21187,22 +20848,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"
@@ -21210,15 +20865,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
@@ -21247,7 +20902,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"
@@ -21255,11 +20910,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"
@@ -21283,7 +20938,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"
@@ -21314,11 +20969,11 @@ msgstr "%s = %s"
 
 #: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
-msgstr "Algoritam potpisa sertifikata"
+msgstr "Algoritam potpisa uverenja"
 
 #: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
-msgstr "Izdavalac"
+msgstr "IzdavaÄ"
 
 #: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
@@ -21330,7 +20985,7 @@ msgstr "Jedinstveni IB subjekta"
 
 #: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
-msgstr "Vrednost potpisa sertifikata"
+msgstr "Vrednost potpisa uverenja"
 
 #: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
@@ -21342,7 +20997,7 @@ msgstr "Unesite lozinku za PKCS12 datoteku:"
 
 #: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
-msgstr "UveÅen sertifikat"
+msgstr "UveÅeno uverenje"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -21354,7 +21009,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"
@@ -21374,19 +21029,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"
@@ -21394,11 +21049,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"
@@ -21414,7 +21069,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?
@@ -21425,7 +21080,7 @@ msgstr "Sa _statusom"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
-msgstr "UTC"
+msgstr "KUV (UTC)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
@@ -21437,7 +21092,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 ""
@@ -21450,7 +21105,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:346
 #: ../widgets/menus/gal-define-views.ui.h:4
@@ -21472,7 +21127,7 @@ msgstr "Odredi preglede za â%sâ"
 msgid "Table"
 msgstr "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "SaÄuvaj trenutni pregled"
 
@@ -21500,40 +21155,40 @@ msgstr "Tip pregleda"
 msgid "Type of view:"
 msgstr "Tip pregleda:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "_Ime datoteke:"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME tip:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "_PredloÅi automatski prikaz priloga"
 
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:100
 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:149
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Ne mogu da poÅaljem prilog"
@@ -21541,42 +21196,42 @@ msgstr[1] "Ne mogu da poÅaljem priloge"
 msgstr[2] "Ne mogu da poÅaljem priloge"
 msgstr[3] "Ne mogu da poÅaljem prilog"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "_PoÅalji za..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
-msgstr "Åalje izabrane priloge negde"
+msgstr "PoÅaljite izabrane priloge negde"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "UÄitavanje"
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "Äuvanje"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "Sakrij liniju pri_loga"
 
-#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show Attachment _Bar"
 msgstr "PrikaÅi liniju p_riloga"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "Dodaj prilog"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "Pri_loÅi"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "SaÄuvaj prilog"
@@ -21585,147 +21240,143 @@ msgstr[2] "SaÄuvaj priloge"
 msgstr[3] "SaÄuvaj prilog"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:346
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "S_ave All"
 msgstr "SaÄ_uvaj sve"
 
-#: ../widgets/misc/e-attachment-view.c:372
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../widgets/misc/e-attachment-view.c:396
+#: ../widgets/misc/e-attachment-view.c:401
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../widgets/misc/e-attachment-view.c:403
-#, fuzzy
-#| msgid "S_ave All"
+#: ../widgets/misc/e-attachment-view.c:408
 msgid "Hid_e All"
-msgstr "SaÄ_uvaj sve"
+msgstr "Sak_rij sve"
 
-#: ../widgets/misc/e-attachment-view.c:410
+#: ../widgets/misc/e-attachment-view.c:415
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../widgets/misc/e-attachment-view.c:417
-#, fuzzy
-#| msgid "_View Inline"
+#: ../widgets/misc/e-attachment-view.c:422
 msgid "Vie_w All Inline"
-msgstr "Pre_gledaj unutar"
+msgstr "Pre_gledaj sve unutar"
 
-#: ../widgets/misc/e-attachment-view.c:734
+#: ../widgets/misc/e-attachment-view.c:739
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Otvori sa â%sâ"
 
-#: ../widgets/misc/e-attachment-view.c:737
+#: ../widgets/misc/e-attachment-view.c:742
 #, c-format
 msgid "Open this attachment in %s"
-msgstr "Otvori ovaj prilog u %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
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1021
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "PriloÅena poruka"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 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:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 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:1949
+#: ../widgets/misc/e-attachment.c:1928
 #, 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:1952
+#: ../widgets/misc/e-attachment.c:1931
 #, 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:2228
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
-msgstr "Nije moguÄe otvoriti â%sâ"
+msgstr "Ne mogu da otvorim â%sâ"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2210
 #, 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:2666
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "SadrÅaj priloga nije uÄitan"
 
 # * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2721
 #, 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:2745
+#: ../widgets/misc/e-attachment.c:2724
 #, 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:359
 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:1255
+#: ../widgets/misc/e-calendar-item.c:1258
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "MeseÄni kalendar"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "Kodna strana"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Izaberite kodnu stranu za koriÅÄenje"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:505
 msgid "Date and Time"
 msgstr "Datum i vreme"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:526
 msgid "Text entry to input date"
 msgstr "Deo teksta za unos datuma"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:548
 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
+#: ../widgets/misc/e-dateedit.c:594
 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
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:672
 msgid "_Today"
 msgstr "_Danas"
 
@@ -21736,7 +21387,7 @@ msgstr "_Danas"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:680
 msgid "_None"
 msgstr "NiÅt_a"
 
@@ -21747,133 +21398,129 @@ msgstr "NiÅt_a"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
-#: ../widgets/misc/e-import-assistant.c:246
+#: ../widgets/misc/e-import-assistant.c:249
 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:263
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: ../widgets/misc/e-import-assistant.c:273
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../widgets/misc/e-import-assistant.c:287
-#: ../widgets/misc/e-import-assistant.c:462
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_Tip datoteke:"
 
-#: ../widgets/misc/e-import-assistant.c:330
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
 msgid "Choose the destination for this import"
 msgstr "Izaberite odrediÅte za ovaj uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite tip uvoznika:"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podeÅavanja iz _starijih programa"
 
-#: ../widgets/misc/e-import-assistant.c:371
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: ../widgets/misc/e-import-assistant.c:523
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
 "like to try again, please click the \"Back\" button."
 msgstr ""
-"Evolucija je za uvoz proverila podeÅavanja sledeÄih programa: Pine, Netscape, "
-"Elm, iCalendar. Nema podeÅavanja koja bi se mogla uvesti. Ukoliko Åelite da "
-"pokuÅate ponovo, kliknite na dugme âNazadâ."
+"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:770
-#, fuzzy
-#| msgid "Cancel"
+#: ../widgets/misc/e-import-assistant.c:773
 msgid "_Cancel Import"
-msgstr "OtkaÅi"
+msgstr "_OtkaÅi uvoÅenje"
 
-#: ../widgets/misc/e-import-assistant.c:912
-#, fuzzy
-#| msgid "Preview the message to be printed"
+#: ../widgets/misc/e-import-assistant.c:915
 msgid "Preview data to be imported"
-msgstr "Pregledaj poruku pred Åtampu"
+msgstr "Pregledaj podatke koji se uvoze"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1347
-#: ../widgets/misc/e-import-assistant.c:1356
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
 msgid "Import Data"
 msgstr "Uvezi podatke"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:929
 msgid "Select what type of file you want to import from the list."
 msgstr "Izaberite sa spiska koje vrste datoteka Åelite da uvezete."
 
-#: ../widgets/misc/e-import-assistant.c:1271
-#: ../widgets/misc/e-import-assistant.c:1305
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Evolution Import Assistant"
 msgstr "PomoÄnik Evolucije za uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:1288
-#: ../widgets/misc/e-import-assistant.c:1335
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
 msgid "Import Location"
 msgstr "Uvezi lokaciju"
 
-#: ../widgets/misc/e-import-assistant.c:1299
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 msgstr ""
-"Dobro doÅli u PomoÄnika Evolucije za uvoz.\n"
+"DobrodoÅli u PomoÄnika Evolucije za uvoz.\n"
 "Ovaj pomoÄnik Äe vas provesti kroz postupak uvoza spoljnih datoteka u "
 "Evoluciju."
 
-#: ../widgets/misc/e-import-assistant.c:1313
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Importer Type"
 msgstr "Tip uvoznika"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Select Information to Import"
 msgstr "Izaberite informaciju za uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:1328
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Select a File"
 msgstr "Izaberite datoteku"
 
-#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknite na âPrimeniâ da zapoÄnete uvoz datoteke u Evoluciju. "
 
-#: ../widgets/misc/e-map.c:624
+#: ../widgets/misc/e-map.c:557
 msgid "World Map"
 msgstr "Karta sveta"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:559
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21893,65 +21540,65 @@ 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:276
+#: ../widgets/misc/e-preferences-window.c:278
 msgid "Evolution Preferences"
 msgstr "PodeÅavanja Evolucije"
 
 # bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "Pro_naÄi:"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "OÄisti pretragu"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:606
 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:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Next"
 msgstr "_SledeÄe"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:622
 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:629
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Mat_ch case"
-msgstr "Pa_zi na veliÄinu slova"
+msgstr "Po_klopi veliÄinu slova"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:660
 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:679
+#: ../widgets/misc/e-search-bar.c:682
 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:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 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"
@@ -21966,134 +21613,153 @@ msgid "Delivery Options"
 msgstr "Opcije isporuke"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgid "For Your Eyes Only"
-msgstr "Samo za VaÅe oÄi"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Do"
 
 #: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Posle"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dana"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Un_utar"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+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"
+
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "OpÅ_te opcije"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "Priznanica poÅte"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "VlasniÄko"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../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:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "Povratno obaveÅtenje"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "PraÄenje sta_tusa"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "Standard"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "PraÄenje statusa"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "Strogo poverljivo"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../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:26
+#: ../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:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
-msgstr "Kada je odbi_jeno:"
-
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "Un_utar"
+msgstr "Kada je _odbijeno:"
 
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-#| msgid "_After:"
-msgid "_After"
-msgstr "_Posle"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Svi podaci"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "_Klasifikacija:"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "_OdloÅi isporuku poruke"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_IsporuÄeno"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
-msgstr "_Postavi rok"
-
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-#| msgid "_Until:"
-msgid "_Until"
-msgstr "_Do"
+msgstr "Postavi _rok"
 
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../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:41
+#: ../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.
+# 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: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "NiÅta"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:555
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "_SaÄuvaj i zatvori"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:422
 msgid "Edit Signature"
 msgstr "Uredi potpis"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:437
 msgid "_Signature Name:"
 msgstr "Naziv _potpisa:"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
 msgid "Add Signature Script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
 msgid "Edit Signature Script"
 msgstr "Uredi skriptu potpisa"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
 msgid "Add _Script"
 msgstr "Dodaj sk_riptu"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22103,56 +21769,56 @@ msgstr ""
 "potpis. Ime koje ste dali Äe biti koriÅÄeno\n"
 "samo za prikaz."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "S_kripta:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "Datoteka skripte mora biti izvrÅna."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "Kliknite ovde da posetite adresu"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "_UmnoÅi mesto veze"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "UmnoÅava vezu u spisak iseÄaka"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u ÄitaÄu"
+msgstr "_Otvori vezu u pregledaÄu"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:386
 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:389
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
-msgstr "_UmnoÅi elektronsku adresu"
+msgstr "_UmnoÅi adresu e-poÅte"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
-msgstr "Pritisnite da sakrijete/otkrijete adrese"
+msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
-msgstr "Pritisnite da otvorite %s"
+msgstr "Kliknite da otvorite %s"
 
 #: ../widgets/misc/ea-calendar-item.c:299
 #: ../widgets/misc/ea-calendar-item.c:308
@@ -22172,7 +21838,7 @@ msgstr "stavka kalendara evolucije"
 msgid "popup list"
 msgstr "iskaÄuÄa lista"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:300
 msgid "Now"
 msgstr "Sada"
 
@@ -22182,23 +21848,23 @@ msgstr "Sada"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "U redu"
 
-#: ../widgets/table/e-cell-date-edit.c:872
+#: ../widgets/table/e-cell-date-edit.c:869
 #, c-format
 msgid "The time must be in the format: %s"
 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:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
@@ -22206,28 +21872,28 @@ msgstr "Vrednost postotka mora biti izmeÄu 0 i 100"
 msgid "click to add"
 msgstr "kliknite da dodate"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(RastuÄe)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(OpadajuÄe)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Nije razvrstano"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Bez grupisanja"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "PrikaÅi polja"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Dostupna polja"
 
@@ -22329,14 +21995,13 @@ msgstr ""
 #. Example: "Family name: Smith (13 items)"
 #.
 #: ../widgets/table/e-table-group-container.c:351
-#, fuzzy, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
+#, 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.
@@ -22351,7 +22016,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:1546
 msgid "Customize Current View"
@@ -22415,11 +22080,6 @@ msgstr "_PrilagoÄeno"
 msgid "popup a child"
 msgstr "iskaÄuÄe izvedeno"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "poÄni ureÄivanjem ove Äelije"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -22428,12 +22088,12 @@ msgstr "biranje Äelije"
 #. Translators: description of an "expand" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
-msgstr "razgranava red u ETree gde se Äelija nalazi"
+msgstr "razgranava red u Establo koje sdrÅi ovu Äeliju"
 
 #. Translators: description of a "collapse" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
-msgstr "skuplja red u ETree gde se Äelija nalazi"
+msgstr "skuplja red u Establo koje sadrÅi ovu Äeliju"
 
 #: ../widgets/table/gal-a11y-e-cell.c:119
 msgid "Table Cell"
@@ -22447,10 +22107,13 @@ msgstr "klik"
 msgid "sort"
 msgstr "razvrstavanje"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2522
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2534
 msgid "Input Methods"
 msgstr "Metodi unosa"
+
+#~ msgid "Unable to reconstruct message from autosave file"
+#~ msgstr "Nije moguÄe povratiti poruku iz automatskog Äuvanja"



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