[evolution/gnome-2-32] Updated Serbian translation



commit b440a2b615e6fd65cd39f677f4973888b415f712
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]