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



commit b2ee00c71b690195bcc72b0e365a5857828ec704
Author: Igor NestoroviÄ? <jung one ekof bg ac yu>
Date:   Tue Sep 1 14:56:12 2009 +0000

    Updated Serbian translation

 po/sr.po       |15800 +++++++++++++++++++++++++++-----------------------------
 po/sr latin po |15800 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 14942 insertions(+), 16658 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index a4de303..f443557 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,21 +6,18 @@
 # Maintainer: Ð?гоÑ? Ð?еÑ?Ñ?оÑ?овиÑ? <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by Ð?гоÑ? Ð?еÑ?Ñ?оÑ?овиÑ? <igor prevod org>
 #
-#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2009-04-09 10:59+0000\n"
-"PO-Revision-Date: 2008-09-19 21:31+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
+"POT-Creation-Date: 2009-08-28 13:23+0000\n"
+"PO-Revision-Date: 2009-08-31 10:56+0100\n"
 "Last-Translator: Ð?гоÑ? Ð?еÑ?Ñ?оÑ?овиÑ? <igor prevod org>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # note(slobo): message thread, низ --> боÑ?и пÑ?евод Ñ?е Ñ?аÑ?пÑ?ава
 # note(slobo): понегде Ñ?ам за summary коÑ?иÑ?Ñ?ио --> â??Ñ? кÑ?аÑ?ким Ñ?Ñ?Ñ?амаâ??
@@ -32,27 +29,27 @@ msgstr ""
 # note(slobo): spam , Ð?Ñ?бÑ?е --> Ð?ежеÑ?ена поÑ?Ñ?а
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
-msgstr "еволÑ?Ñ?иÑ?ин адÑ?еÑ?аÑ?"
+msgstr "Ð?дÑ?еÑ?аÑ? Ð?волÑ?Ñ?иÑ?е"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Ð?ови конÑ?акÑ?"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Ð?ова конÑ?акÑ? лиÑ?Ñ?а"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Ñ?Ñ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла именика %s има %d каÑ?Ñ?Ñ?"
-msgstr[1] "Ñ?Ñ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла именика %s има %d каÑ?Ñ?е"
-msgstr[2] "Ñ?Ñ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла именика %s има %d каÑ?Ñ?и"
+msgstr[0] "Ñ?Ñ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла адÑ?еÑ?аÑ?а %s има %d каÑ?Ñ?Ñ?"
+msgstr[1] "Ñ?Ñ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла адÑ?еÑ?аÑ?а %s има %d каÑ?Ñ?е"
+msgstr[2] "Ñ?Ñ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла адÑ?еÑ?аÑ?а %s има %d каÑ?Ñ?и"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -70,38 +67,38 @@ msgstr "Ð?онÑ?акÑ?: "
 msgid "evolution minicard"
 msgstr "миникаÑ?Ñ?а еволÑ?Ñ?иÑ?е"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Ð?ма алаÑ?ме."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Ð?ма понавÑ?аÑ?а."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "То Ñ?е Ñ?аÑ?Ñ?анак."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Ð?алендаÑ?Ñ?ки догаÑ?аÑ?: пÑ?еглед Ñ?е %s."
+msgstr "Ð?алендаÑ?Ñ?ки догаÑ?аÑ?: Ñ?ажеÑ?ак Ñ?е %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
-msgstr "Ð?алендаÑ?Ñ?ки догаÑ?аÑ?: нема пÑ?еглед."
+msgstr "Ð?алендаÑ?Ñ?ки догаÑ?аÑ?: нема Ñ?ажеÑ?ка."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "догаÑ?аÑ? пÑ?егледа календаÑ?а"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "УÑ?ваÑ?и Ñ?окÑ?Ñ?"
 
 #: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
-msgstr "Ð?ови заказани Ñ?аÑ?Ñ?анак"
+msgstr "Ð?ово заказиваÑ?е"
 
 #: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
@@ -119,14 +116,15 @@ msgstr "Ð?ди на данаÑ?Ñ?и дан"
 msgid "Go to Date"
 msgstr "Ð?ди на даÑ?Ñ?м"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "Ñ?абела за пÑ?иказ и избоÑ? Ñ?екÑ?Ñ?ег вÑ?еменÑ?ког Ñ?аÑ?пона"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
+#: ../a11y/calendar/ea-day-view.c:148
+#: ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -136,7 +134,8 @@ msgstr[2] "Ð?ма %d догаÑ?аÑ?а."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
+#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Ð?ема догаÑ?аÑ?а."
 
@@ -165,7 +164,7 @@ msgid "calendar view for one or more days"
 msgstr "пÑ?еглед календаÑ?а за Ñ?едан или виÑ?е дана"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -181,18 +180,19 @@ msgstr "%A, %d. %b %Y."
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844
+#: ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -200,10 +200,10 @@ msgstr "%a %d %b %Y."
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -217,31 +217,32 @@ msgstr "%d. %b %Y."
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Ð?номов календаÑ?"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
-msgstr "линиÑ?а пÑ?еÑ?Ñ?аге"
+msgstr "Ñ?Ñ?ака пÑ?еÑ?Ñ?аге"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
-msgstr "линиÑ?а пÑ?еÑ?Ñ?аге еволÑ?Ñ?иÑ?а календаÑ?а"
+msgstr "Ñ?Ñ?ака пÑ?еÑ?Ñ?аге календаÑ?а еволÑ?Ñ?иÑ?е"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "Ð?Ñ?гме за пÑ?еÑ?какаÑ?е"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Ð?ликниÑ?е овде, можеÑ?е наÑ?и Ñ?оÑ? догаÑ?аÑ?а."
 
@@ -272,20 +273,20 @@ msgstr "иÑ?каÑ?Ñ?Ñ?е"
 msgid "popup a child"
 msgstr "иÑ?каÑ?Ñ?Ñ?е изведено"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "Ñ?Ñ?еÑ?иваÑ?е"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
-msgstr "поÑ?иÑ?е Ñ?Ñ?еÑ?иваÑ?ем ове Ñ?елиÑ?е"
+msgstr "поÑ?ни Ñ?Ñ?еÑ?иваÑ?ем ове Ñ?елиÑ?е"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "биÑ?аÑ?е"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "биÑ?аÑ?е Ñ?елиÑ?е"
 
@@ -305,17 +306,17 @@ msgstr "Ñ?кÑ?пÑ?а"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Ñ?кÑ?пÑ?а Ñ?ед Ñ? ETree где Ñ?е Ñ?елиÑ?а налази"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "Ð?елиÑ?а Ñ?абеле"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "кликниÑ?е да додаÑ?е"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "клик"
 
@@ -335,7 +336,7 @@ msgstr "Ð?алендаÑ?: од %s до %s"
 
 #: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
-msgstr "пÑ?едмеÑ? еволÑ?Ñ?иÑ?а календаÑ?а"
+msgstr "Ñ?Ñ?авка календаÑ?а еволÑ?Ñ?иÑ?е"
 
 #: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
@@ -343,36 +344,20 @@ msgstr "Ð?Ñ?гме за комбиноваÑ?е"
 
 #: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
-msgstr "Ð?кÑ?ивиÑ?аÑ? подÑ?азÑ?мевано"
+msgstr "Ð?кÑ?ивиÑ?а подÑ?азÑ?мевано"
 
 #: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Ð?Ñ?каÑ?Ñ?Ñ?и мени"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Ð?Ñ?иказ линиÑ?е пÑ?илога"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "акÑ?ивиÑ?аÑ?и"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"Ð?дÑ?еÑ?аÑ? â??{0}â?? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?еÑ?е и ниÑ?е подложан изменама. Ð?забеÑ?иÑ?е дÑ?Ñ?ги "
-"адÑ?еÑ?аÑ? Ñ?а боÑ?не Ñ?Ñ?аке Ñ? погледÑ? Ð?онÑ?акÑ?и."
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgstr "Ð?дÑ?еÑ?аÑ? â??{0}â?? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е и ниÑ?е подложан изменама. Ð?забеÑ?иÑ?е дÑ?Ñ?ги адÑ?еÑ?аÑ? Ñ?а боÑ?не Ñ?Ñ?аке Ñ? пÑ?егледÑ? Ð?онÑ?акÑ?и."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Ð?онÑ?акÑ? Ñ?а овом адÑ?еÑ?ом веÑ? поÑ?Ñ?оÑ?и. Ð?елиÑ?е ли ипак да додаÑ?е новÑ? каÑ?Ñ?Ñ? Ñ?а "
-"иÑ?Ñ?ом адÑ?еÑ?ом?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "Ð?онÑ?акÑ? Ñ?а овом адÑ?еÑ?ом веÑ? поÑ?Ñ?оÑ?и. Ð?елиÑ?е ли ипак да додаÑ?е новÑ? каÑ?Ñ?Ñ? Ñ?а иÑ?Ñ?ом адÑ?еÑ?ом?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -391,14 +376,8 @@ msgid "Category editor not available."
 msgstr "УÑ?еÑ?иваÑ? каÑ?егоÑ?иÑ?а ниÑ?е доÑ?Ñ?Ñ?пан."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Ð?Ñ?овеÑ?иÑ?е да Ñ?е лозинка иÑ?пÑ?авно Ñ?неÑ?а и да коÑ?иÑ?Ñ?иÑ?е подÑ?жани наÑ?ин "
-"пÑ?иÑ?аве. Ð?е забоÑ?авиÑ?е да Ñ?е велиÑ?ина Ñ?лова биÑ?на Ñ? лозинкама; можда Ñ?Ñ? "
-"велика Ñ?лова Ñ?кÑ?Ñ?Ñ?ена."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е лозинка иÑ?пÑ?авно Ñ?неÑ?а и да ли коÑ?иÑ?Ñ?иÑ?е подÑ?жани наÑ?ин пÑ?иÑ?аве. Ð?е забоÑ?авиÑ?е да Ñ?е велиÑ?ина Ñ?лова биÑ?на Ñ? лозинкама; можда Ñ?Ñ? велика Ñ?лова Ñ?кÑ?Ñ?Ñ?ена."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -409,18 +388,16 @@ msgid "Could not remove address book."
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?клониÑ?и адÑ?еÑ?аÑ?."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
-msgstr ""
-"ТÑ?енÑ?Ñ?но из Ð?волÑ?Ñ?иÑ?е можеÑ?е пÑ?иÑ?Ñ?Ñ?пиÑ?и Ñ?амо Ñ?иÑ?Ñ?емÑ?ком адÑ?еÑ?аÑ?Ñ? GroupWise. "
-"Ð?оÑ?иÑ?Ñ?иÑ?е неки дÑ?Ñ?ги GroupWise пÑ?огÑ?ам за елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?Ñ? како би могли "
-"добиÑ?и GroupWise Ñ?еÑ?Ñ?е конÑ?акÑ?е и Ñ?аÑ?Ñ?икле Ñ?а лиÑ?ним конÑ?акÑ?има."
+#| msgid ""
+#| "Currently you can access only GroupWise System Address Book from "
+#| "Evolution. Please use some other GroupWise mail client once, to get your "
+#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "ТÑ?енÑ?Ñ?но из Ð?волÑ?Ñ?иÑ?е можеÑ?е пÑ?иÑ?Ñ?Ñ?пиÑ?и Ñ?амо Ñ?иÑ?Ñ?емÑ?ком адÑ?еÑ?аÑ?Ñ? GroupWise. Ð?оÑ?иÑ?Ñ?иÑ?е неки дÑ?Ñ?ги GroupWise клиÑ?енÑ? за елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?Ñ? како би добили GroupWise Ñ?еÑ?Ñ?е конÑ?акÑ?е и Ñ?аÑ?Ñ?икле Ñ?а лиÑ?ним конÑ?акÑ?има."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "Ð?бÑ?иÑ?аÑ?и именик â??{0}â???"
+msgstr "Ð?бÑ?иÑ?аÑ?и адÑ?еÑ?аÑ? â??{0}â???"
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading address book."
@@ -436,13 +413,13 @@ msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а на LDAP Ñ?еÑ?веÑ?."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Ð?еÑ?Ñ?пело бÑ?иÑ?аÑ?е конÑ?акÑ?а"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "Ð?Ñ?авÑ?еÑ?е GroupWise именика"
+msgstr "Ð?Ñ?авÑ?еÑ?е GroupWise адÑ?еÑ?аÑ?а:"
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
@@ -462,21 +439,12 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Ð?волÑ?Ñ?иÑ?ин адÑ?еÑ?аÑ? Ñ?е неоÑ?екивано пÑ?еÑ?Ñ?ао да Ñ?ади."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Слика коÑ?Ñ? Ñ?Ñ?е изабÑ?али Ñ?е пÑ?евелика. Ð?а ли желиÑ?е да Ñ?оÑ? пÑ?омениÑ?е велиÑ?инÑ? "
-"и Ñ?аÑ?Ñ?ваÑ?е?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Слика коÑ?Ñ? Ñ?Ñ?е изабÑ?али Ñ?е пÑ?евелика. Ð?елиÑ?е ли да Ñ?оÑ? пÑ?омениÑ?е велиÑ?инÑ? и Ñ?аÑ?Ñ?ваÑ?е?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Ð?ваÑ? LDAP Ñ?еÑ?веÑ? можда коÑ?иÑ?Ñ?и Ñ?Ñ?аÑ?иÑ?Ñ? веÑ?зиÑ?Ñ? LDAP-а коÑ?а не подÑ?жава овÑ? "
-"могÑ?Ñ?ноÑ?Ñ?, или Ñ?е лоÑ?е подеÑ?ен. Ð?иÑ?аÑ?Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?а за подÑ?жане оÑ?нове за "
-"пÑ?еÑ?Ñ?агÑ?."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "Ð?ваÑ? LDAP Ñ?еÑ?веÑ? можда коÑ?иÑ?Ñ?и Ñ?Ñ?аÑ?иÑ?Ñ? веÑ?зиÑ?Ñ? LDAP-а коÑ?а не подÑ?жава овÑ? могÑ?Ñ?ноÑ?Ñ?, или Ñ?е лоÑ?е подеÑ?ен. Ð?иÑ?аÑ?Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?а за подÑ?жане оÑ?нове за пÑ?еÑ?Ñ?агÑ?."
 
 # мало аоÑ?иÑ?Ñ?а ;-)
 #: ../addressbook/addressbook.error.xml.h:24
@@ -488,17 +456,13 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "СеÑ?веÑ? овог адÑ?еÑ?аÑ?а не Ñ?адÑ?жи пÑ?едложене оÑ?нове за пÑ?еÑ?Ñ?агÑ?."
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"СеÑ?веÑ? овог адÑ?еÑ?аÑ?а Ñ?е или недоÑ?Ñ?Ñ?пан или Ñ?е Ñ?егово име погÑ?еÑ?но Ñ?неÑ?о или "
-"Ñ?е мÑ?ежа недоÑ?Ñ?Ñ?пна."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "СеÑ?веÑ? овог адÑ?еÑ?аÑ?а Ñ?е или недоÑ?Ñ?Ñ?пан или Ñ?е Ñ?егово име погÑ?еÑ?но Ñ?неÑ?о или Ñ?е мÑ?ежа недоÑ?Ñ?Ñ?пна."
 
 # мало аоÑ?иÑ?Ñ?а ;-)
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
-msgstr "Ð?ваÑ? именик Ñ?е биÑ?и Ñ?Ñ?аÑ?но Ñ?клоÑ?ен."
+msgstr "Ð?ваÑ? адÑ?еÑ?аÑ? Ñ?е биÑ?и Ñ?Ñ?аÑ?но Ñ?клоÑ?ен."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
@@ -521,39 +485,27 @@ msgid "Would you like to save your changes?"
 msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Ð?окÑ?Ñ?аваÑ?е да пÑ?емеÑ?Ñ?иÑ?е конÑ?акÑ? из Ñ?едног адÑ?еÑ?аÑ?а Ñ? дÑ?Ñ?ги али Ñ?е он не "
-"може Ñ?клониÑ?и из извоÑ?а. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е Ñ?множак Ñ?меÑ?Ñ?о Ñ?ога?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "Ð?окÑ?Ñ?аваÑ?е да пÑ?емеÑ?Ñ?иÑ?е конÑ?акÑ? из Ñ?едног адÑ?еÑ?аÑ?а Ñ? дÑ?Ñ?ги али Ñ?е он не може Ñ?клониÑ?и из извоÑ?а. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е Ñ?множак Ñ?меÑ?Ñ?о Ñ?ога?"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"Ð?овезÑ?Ñ?еÑ?е Ñ?е на неподÑ?жан GroupWise Ñ?еÑ?веÑ? Ñ?Ñ?о може да доведе до пÑ?облема Ñ? "
-"Ñ?адÑ? Ð?волÑ?Ñ?иÑ?е. Ð?аÑ?боÑ?е Ñ?е да Ñ?еÑ?веÑ? бÑ?де надогÑ?аÑ?ен на подÑ?жанÑ? веÑ?зиÑ?Ñ?"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "Ð?овезÑ?Ñ?еÑ?е Ñ?е на неподÑ?жан GroupWise Ñ?еÑ?веÑ? Ñ?Ñ?о може да доведе до пÑ?облема Ñ? Ñ?адÑ? Ð?волÑ?Ñ?иÑ?е. Ð?аÑ?боÑ?е Ñ?е да Ñ?еÑ?веÑ? бÑ?де надогÑ?аÑ?ен на подÑ?жанÑ? веÑ?зиÑ?Ñ?"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Ð?емаÑ?е довоÑ?на овлаÑ?Ñ?еÑ?а да бÑ?иÑ?еÑ?е конÑ?акÑ?е из овог адÑ?еÑ?аÑ?а."
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "Ð?зменили Ñ?Ñ?е оваÑ? конÑ?акÑ?. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е ове пÑ?омене?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Ð?аÑ?и конÑ?акÑ?и за {0} неÑ?е биÑ?и доÑ?Ñ?Ñ?пни док Ñ?е Ð?волÑ?Ñ?иÑ?а поново не покÑ?ене."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Ð?онÑ?акÑ?и за {0} неÑ?е биÑ?и доÑ?Ñ?Ñ?пни док Ñ?е Ð?волÑ?Ñ?иÑ?а поново не покÑ?ене."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -578,7 +530,8 @@ msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?ако како Ñ?е"
 
 # bug: we don't want this translated
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../mail/mail.error.xml.h:143
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
@@ -589,105 +542,101 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Ð?одÑ?азÑ?мевана адÑ?еÑ?а за Ñ?Ñ?клаÑ?иваÑ?е:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аÑ?и адÑ?еÑ?аÑ?"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?аÑ?е пÑ?огÑ?амÑ?ког блока адÑ?еÑ?а пилоÑ?а"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "СамодопÑ?Ñ?аваÑ?е"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "Ð?_онÑ?акÑ?и"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "СеÑ?Ñ?иÑ?икаÑ?и"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Ð?одеÑ?иÑ?е Ñ?амодопÑ?Ñ?аваÑ?е овде"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#| msgid "Configure autocomplete here"
+msgid "Configure contacts and autocompletion here"
+msgstr "Ð?одеÑ?иÑ?е конÑ?акÑ?е и Ñ?амодопÑ?Ñ?аваÑ?е овде"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193
+#: ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Ð?онÑ?акÑ?и"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
-msgstr "Ð?волÑ?Ñ?иÑ?ин именик"
+msgstr "Ð?дÑ?еÑ?аÑ? Ð?волÑ?Ñ?иÑ?е"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "Ð?Ñ?озоÑ?Ñ?е за адÑ?еÑ?е Ð?волÑ?Ñ?иÑ?иног адÑ?еÑ?аÑ?а"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
-msgstr "Ð?Ñ?егледаÑ? адÑ?еÑ?а Ð?волÑ?Ñ?иÑ?иног именика"
+msgstr "Ð?Ñ?егледаÑ? адÑ?еÑ?а Ð?волÑ?Ñ?иÑ?иног адÑ?еÑ?аÑ?а"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
-msgstr "Ð?Ñ?егледаÑ? каÑ?Ñ?и Ð?волÑ?Ñ?иÑ?иног именика"
+msgstr "Ð?Ñ?егледаÑ? каÑ?Ñ?и Ð?волÑ?Ñ?иÑ?иног адÑ?еÑ?аÑ?а"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
-msgstr "Ð?ео Ð?волÑ?Ñ?иÑ?е â?? Ð?меник"
+msgstr "Ð?ео Ð?дÑ?еÑ?аÑ?а Ð?волÑ?Ñ?иÑ?е"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Ð?онÑ?Ñ?ола Ñ?пÑ?авÑ?аÑ?а S/MIME Ñ?еÑ?Ñ?иÑ?икаÑ?има Ð?волÑ?Ñ?иÑ?е"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
-msgstr "Ð?онÑ?Ñ?ола подеÑ?аваÑ?а Ñ?аÑ?Ñ?икли Ð?волÑ?Ñ?иÑ?е"
+msgstr "Ð?онÑ?Ñ?ола поÑ?Ñ?авки Ñ?аÑ?Ñ?икли Ð?волÑ?Ñ?иÑ?е"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "УпÑ?авÑ?аÑ?Ñ?е S/MIME Ñ?еÑ?Ñ?иÑ?икаÑ?има овде"
 
 # On This Computer is always first and VFolders is always last
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151
+#: ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576
+#: ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148
+#: ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193
+#: ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320
+#: ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Ð?а овом Ñ?аÑ?Ñ?наÑ?Ñ?"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Ð?а LDAP Ñ?еÑ?веÑ?има"
+
 # Create the default Person calendar
 # Create the default Person task list
 # orange
@@ -702,166 +651,186 @@ msgstr "Ð?а овом Ñ?аÑ?Ñ?наÑ?Ñ?"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189
+#: ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484
+#: ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098
+#: ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190
+#: ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Ð?иÑ?но"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "Ð?а LDAP Ñ?еÑ?веÑ?има"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Ð?онÑ?акÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Ð?апÑ?ави нови конÑ?акÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Ð?онÑ?акÑ? ли_Ñ?Ñ?а"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Ð?апÑ?ави новÑ? конÑ?акÑ? лиÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
-msgstr "Ð?ови именик"
+msgstr "Ð?ови адÑ?еÑ?аÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Ð?дÑ?еÑ?аÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
-msgstr "Ð?апÑ?ави нови именик"
+msgstr "Ð?апÑ?ави нови адÑ?еÑ?аÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "Ð?еÑ?Ñ?пела надогÑ?адÑ?а подеÑ?аваÑ?а именика или Ñ?еговиÑ? Ñ?аÑ?Ñ?икли."
+msgstr "Ð?еÑ?Ñ?пела надогÑ?адÑ?а поÑ?аÑ?вки адÑ?еÑ?аÑ?а или Ñ?еговиÑ? Ñ?аÑ?Ñ?икли."
+
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Ð?дабиÑ? ове могÑ?Ñ?ноÑ?Ñ?и знаÑ?и да Ñ?е Ñ?е Ð?волÑ?Ñ?иÑ?а повезаÑ?и на LDAP Ñ?еÑ?веÑ? Ñ?амо ако он подÑ?жава SSL Ñ?иÑ?Ñ?оваÑ?е."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Ð?дабиÑ? ове могÑ?Ñ?ноÑ?Ñ?и знаÑ?и да Ñ?е Ñ?е Ð?волÑ?Ñ?иÑ?а повезаÑ?и на LDAP Ñ?еÑ?веÑ? Ñ?амо ако он подÑ?жава TLS Ñ?иÑ?Ñ?оваÑ?е."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "Ð?дабиÑ? ове могÑ?Ñ?ноÑ?Ñ?и знаÑ?и да Ñ?еÑ?веÑ? не подÑ?жава ни SSL ни TLS Ñ?иÑ?Ñ?оваÑ?е. То знаÑ?и да Ð?аÑ?а веза неÑ?е биÑ?и Ñ?игÑ?Ñ?на и да Ñ?еÑ?е биÑ?и Ñ?аÑ?иви на Ñ?игÑ?Ñ?ноÑ?не нападе. "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Ð?аза"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "Умножи Ñ?адÑ?жаÑ? _кÑ?иге локално за Ñ?ад ван мÑ?еже"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "Ð?во Ñ?е поÑ?Ñ? LDAP Ñ?еÑ?веÑ?а на коÑ?и Ñ?е Ð?волÑ?Ñ?иÑ?а покÑ?Ñ?аÑ?и да Ñ?е повеже. Ð?онÑ?Ñ?ен Ñ?е Ñ?пиÑ?ак Ñ?Ñ?андаÑ?дниÑ? поÑ?Ñ?ова. Ð?иÑ?аÑ?Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?а Ñ?иÑ?Ñ?ема коÑ?и поÑ?Ñ? да наведеÑ?е."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?е коÑ?иÑ?Ñ?иÑ?и оваÑ? меÑ?од за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ?.  Ð?Ñ?имеÑ?иÑ?е да Ñ?егово Ñ?кÑ?Ñ?Ñ?иваÑ?е на â??Ð?лекÑ?Ñ?онÑ?ка адÑ?еÑ?аâ?? заÑ?Ñ?ева анонимни пÑ?иÑ?Ñ?Ñ?п на LDAP Ñ?еÑ?веÑ?."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "Ð?бим пÑ?еÑ?Ñ?аге деÑ?иниÑ?е дÑ?бинÑ? коÑ?ом желиÑ?е да пÑ?еÑ?Ñ?ага обÑ?Ñ?ваÑ?и Ñ?Ñ?абло диÑ?екÑ?оÑ?иÑ?Ñ?ма. Ð?бим пÑ?еÑ?Ñ?аге â??подâ?? Ñ?е Ñ?кÑ?Ñ?Ñ?иÑ?и Ñ?ве Ñ?ноÑ?е иÑ?под базе за пÑ?еÑ?Ñ?агÑ?. Ð?бим пÑ?еÑ?Ñ?аге â??Ñ?еданâ?? Ñ?е Ñ?кÑ?Ñ?Ñ?иÑ?и Ñ?амо Ñ?ноÑ?е Ñ?едан ниво иÑ?под Ð?аÑ?е базе."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283
+#: ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Ð?пÑ?Ñ?е"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
-msgstr "Ð?меник"
+msgstr "Ð?дÑ?еÑ?аÑ?"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Ð?одаÑ?и Ñ?еÑ?веÑ?а"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Ð?еÑ?аÑ?и"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Ð?Ñ?еÑ?Ñ?аживаÑ?е"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Ð?Ñ?еÑ?зимаÑ?е"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
-msgstr "Ð?одеÑ?аваÑ?а именика"
+msgstr "Ð?оÑ?Ñ?авке адÑ?еÑ?аÑ?а"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Ð?Ñ?еноÑ?еÑ?е..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Ð?Ñ?еноÑ?еÑ?е â??%sâ??:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP Ñ?еÑ?веÑ?и"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
-msgstr "Ð?одеÑ?аваÑ?а Ñ?амодопÑ?Ñ?аваÑ?а"
+msgstr "Ð?оÑ?Ñ?авке Ñ?амодопÑ?Ñ?аваÑ?а"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Ð?Ñ?Ñ?аÑ?а и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли за конÑ?акÑ?е Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од "
-"Ð?волÑ?Ñ?иÑ?е 1.x.\n"
+"Ð?Ñ?Ñ?аÑ?а и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли за конÑ?акÑ?е Ñ? Ð?волÑ?Ñ?иÑ?и измеÑ?ена Ñ?е од Ð?волÑ?Ñ?иÑ?е 1.x.\n"
 "\n"
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Ð?блик за конÑ?акÑ?е допиÑ?ниÑ? лиÑ?Ñ?а Ñ?е измеÑ?ен.\n"
+"ФоÑ?маÑ? за конÑ?акÑ?е допиÑ?ниÑ? лиÑ?Ñ?а Ñ?е измеÑ?ен.\n"
 "\n"
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -871,7 +840,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -882,55 +851,63 @@ msgstr ""
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и подаÑ?ке Ñ?а Pilot Sync Ñ?Ñ?еÑ?аÑ?а..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ð?Ñ?еименÑ?Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ?:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Ð?Ñ?еименÑ?Ñ? Ñ?аÑ?Ñ?иклÑ?"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Ð?мена Ñ?аÑ?Ñ?икли не могÑ? да Ñ?адÑ?же â??/â??"
 
 #: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
-msgstr "_Ð?ови именик"
+msgstr "_Ð?ови адÑ?еÑ?аÑ?"
 
 #: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "ЧÑ?ва као вÐ?аÑ?Ñ?Ñ?..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479
+#: ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122
+#: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Ð?Ñ?еименÑ?Ñ?..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482
+#: ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35
+#: ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Ð?бÑ?иÑ?и"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487
+#: ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Ð?_Ñ?обине"
 
@@ -943,20 +920,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ð?нонимно пÑ?иÑ?Ñ?Ñ?паÑ?е LDAP Ñ?еÑ?веÑ?Ñ?"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "УнеÑ?иÑ?е лозинкÑ? за %s (коÑ?иÑ?ник %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "УнеÑ?иÑ?е лозинкÑ?"
@@ -974,28 +951,20 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML за лиÑ?Ñ?Ñ? адÑ?еÑ?а за допÑ?Ñ?аваÑ?е."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Ð?оложаÑ? Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? каÑ?Ñ?е и лиÑ?Ñ?е пÑ?егледа и панела за пÑ?еглед, "
-"Ñ? пикÑ?елима."
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "Ð?оложаÑ? Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? каÑ?Ñ?е и Ñ?пиÑ?ка пÑ?егледа и панела за пÑ?еглед, Ñ? пикÑ?елима."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
-msgstr ""
+msgstr "Ð?Ñ?иказÑ?Ñ?е Ñ?амодопÑ?Ñ?ено име Ñ?а адÑ?еÑ?ом"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Ð?Ñ?икажи повÑ?Ñ? за пÑ?еглед"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Ð?Ñ?оÑ? знакова коÑ?и Ñ?е моÑ?аÑ?Ñ? Ñ?кÑ?Ñ?аÑ?и пÑ?е него Ñ?Ñ?о Ð?волÑ?Ñ?иÑ?а покÑ?Ñ?а да "
-"Ñ?амодопÑ?ни."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "Ð?Ñ?оÑ? знакова коÑ?и Ñ?е моÑ?аÑ?Ñ? Ñ?кÑ?Ñ?аÑ?и пÑ?е него Ñ?Ñ?о Ð?волÑ?Ñ?иÑ?а покÑ?Ñ?а да Ñ?амодопÑ?ни."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
@@ -1006,25 +975,38 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Ð?дÑ?еÑ?а за поÑ?ледÑ?Ñ? коÑ?иÑ?Ñ?енÑ? Ñ?аÑ?Ñ?иклÑ? Ñ? пÑ?озоÑ?Ñ?еÑ?Ñ? за избоÑ? имена."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "Ð?оложаÑ? Ñ?Ñ?пÑ?авне повÑ?Ñ?и"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr "Ð?а ли да Ñ? Ñ?ноÑ?Ñ? обавезно пÑ?икаже адÑ?еÑ?Ñ? е-поÑ?Ñ?е Ñ?а именом Ñ?амодопÑ?Ñ?еног конÑ?акÑ?а."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Ð?а ли Ñ?е пÑ?иказÑ?Ñ?е повÑ?Ñ? за пÑ?еглед."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "СамодопÑ?Ñ?аваÑ?е"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
-msgstr ""
+msgstr "Увек _пÑ?иказÑ?Ñ? адÑ?еÑ?Ñ? Ñ?амодопÑ?Ñ?еног конÑ?акÑ?а"
+
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#| msgid "Date/Time"
+msgid "Date/Time Format"
+msgstr "ФоÑ?маÑ? даÑ?Ñ?м/вÑ?еме"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#| msgid "Table model"
+msgid "Table column:"
+msgstr "Ð?олона Ñ?абеле:"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "Ð?оÑ?Ñ?ажи Ñ? адÑ?еÑ?аÑ?има"
 
@@ -1033,21 +1015,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?а</b>"
@@ -1060,280 +1040,145 @@ msgstr "<b>Ð?Ñ?еÑ?зимаÑ?е</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>Ð?Ñ?еÑ?Ñ?аживаÑ?е</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Тип:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "Ð?одаÑ? именик"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Увек"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Ð?нонимно"
+#| msgid "Using distinguished name (DN)"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Ð?нонимно\n"
+"Ð?оÑ?иÑ?Ñ?еÑ?е адÑ?еÑ?е е-поÑ?Ñ?е\n"
+"Ð?оÑ?иÑ?Ñ?еÑ?е поÑ?ебног имена (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "Ð?Ñ?е_гледа оваÑ? адÑ?еÑ?аÑ? док Ñ?е не доÑ?Ñ?игне лимиÑ?"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Ð?Ñ?новно"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?е коÑ?иÑ?Ñ?иÑ?и овÑ? елекÑ?Ñ?онÑ?кÑ? адÑ?еÑ?Ñ? да Ð?аÑ? аÑ?Ñ?енÑ?иÑ?икÑ?Ñ?е на Ñ?еÑ?веÑ?."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Ð?оÑ?ебно име"
+msgid "Lo_gin:"
+msgstr "Ð?Ñ?и_Ñ?ава:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "Ð?лекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#| msgid "One"
 msgid ""
-"Evolution will use this email address to authenticate you with the server."
+"One\n"
+"Sub"
 msgstr ""
-"Ð?волÑ?Ñ?иÑ?а Ñ?е коÑ?иÑ?Ñ?иÑ?и овÑ? елекÑ?Ñ?онÑ?кÑ? адÑ?еÑ?Ñ? да Ð?аÑ? аÑ?Ñ?енÑ?иÑ?икÑ?Ñ?е на Ñ?еÑ?веÑ?."
+"Ð?едан\n"
+"Ð?од"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Ð?аÑ?и могÑ?Ñ?е оÑ?нове за пÑ?еÑ?Ñ?агÑ?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "Ð?Ñ?и_Ñ?ава:"
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL Ñ?иÑ?Ñ?оваÑ?е\n"
+"TLS Ñ?иÑ?Ñ?оваÑ?е\n"
+"Ð?ез Ñ?иÑ?Ñ?оваÑ?а"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "Ð?икада"
+msgid "Search Filter"
+msgstr "Ð?Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "Ð?е коÑ?иÑ?Ñ?и Ñ?е Ñ?иÑ?Ñ?оваÑ?е"
+msgid "Search _base:"
+msgstr "Ð?Ñ?нова за _пÑ?еÑ?Ñ?агÑ?:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Ð?едан"
+msgid "Search _filter:"
+msgstr "Ð?_Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге:"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL Ñ?иÑ?Ñ?оваÑ?е"
+#| msgid ""
+#| "Search filter is the type of the objects searched for, while performing "
+#| "the search. If this is not modified, by  default search will be performed "
+#| "on objectclass of the type \"person\"."
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgstr "ФилÑ?еÑ? пÑ?еÑ?Ñ?аге Ñ?е вÑ?Ñ?Ñ?а обÑ?екÑ?а за коÑ?им Ñ?е Ñ?Ñ?ага. Ð?ко Ñ?е ово не измени, подÑ?азÑ?мевана пÑ?еÑ?Ñ?ага Ñ?е биÑ?и обавÑ?ена на вÑ?Ñ?Ñ?и â??оÑ?обаâ??."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "Ð?Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге"
+msgid "Supported Search Bases"
+msgstr "Ð?одÑ?жане базе за пÑ?еÑ?Ñ?агÑ?"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "Ð?Ñ?нова за _пÑ?еÑ?Ñ?агÑ?:"
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "Ð?аза за пÑ?еÑ?Ñ?агÑ? Ñ?е поÑ?ебно име (DN) Ñ?ноÑ?а одакле Ñ?е Ð?аÑ?а пÑ?еÑ?Ñ?ага поÑ?еÑ?и. Ð?ко ово оÑ?Ñ?авиÑ?е пÑ?азно, пÑ?еÑ?Ñ?ага Ñ?е поÑ?еÑ?и из коÑ?ена Ñ?Ñ?абла диÑ?екÑ?оÑ?иÑ?Ñ?ма."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "Ð?_Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге:"
+msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
+msgstr "Ð?во Ñ?е пÑ?но име Ð?аÑ?ег ldap Ñ?еÑ?веÑ?а. Ð?а пÑ?имеÑ?, â??ldap.mojepreduzece.comâ??."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Ð?Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге"
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "Ð?во Ñ?е наÑ?веÑ?и бÑ?оÑ? Ñ?ноÑ?а за пÑ?еÑ?зимаÑ?е. Ð?ко Ñ?неÑ?еÑ?е Ñ?Ñ?виÑ?е велики бÑ?оÑ? Ñ?Ñ?поÑ?иÑ?еÑ?е адÑ?еÑ?аÑ?."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"Ð?Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге Ñ?е вÑ?Ñ?Ñ?а обÑ?екÑ?а коÑ?и Ñ?е пÑ?еÑ?Ñ?ажÑ?Ñ?е. Ð?ко Ñ?е ово не измени "
-"подÑ?азÑ?мевана пÑ?еÑ?Ñ?ага Ñ?е биÑ?и обавÑ?ена на клаÑ?и обÑ?екÑ?а â??оÑ?обаâ??."
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "Ð?во Ñ?е име Ñ?еÑ?веÑ?а коÑ?е Ñ?е Ñ?е поÑ?авиÑ?и Ñ? лиÑ?Ñ?и Ñ?аÑ?Ñ?икли Ð?волÑ?Ñ?иÑ?е. То Ñ?е Ñ?амо за поÑ?Ñ?ебе пÑ?иказиваÑ?а. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Ð?дабиÑ? ове могÑ?Ñ?ноÑ?Ñ?и знаÑ?и да Ñ?е Ñ?е Ð?волÑ?Ñ?иÑ?а повезаÑ?и на LDAP Ñ?еÑ?веÑ? Ñ?амо "
-"ако он подÑ?жава SSL Ñ?иÑ?Ñ?оваÑ?е."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Ð?дабиÑ? ове могÑ?Ñ?ноÑ?Ñ?и знаÑ?и да Ñ?е Ñ?е Ð?волÑ?Ñ?иÑ?а повезаÑ?и на LDAP Ñ?еÑ?веÑ? Ñ?амо "
-"ако он подÑ?жава TLS Ñ?иÑ?Ñ?оваÑ?е."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Ð?дабиÑ? ове могÑ?Ñ?ноÑ?Ñ?и знаÑ?и да Ñ?еÑ?веÑ? не подÑ?жава ни SSL ни TLS Ñ?иÑ?Ñ?оваÑ?е. "
-"То знаÑ?и да Ð?аÑ?а веза неÑ?е биÑ?и Ñ?игÑ?Ñ?на, и да Ñ?еÑ?е биÑ?и Ñ?аÑ?иви на Ñ?игÑ?Ñ?ноÑ?не "
-"нападе. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Ð?од"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "Ð?одÑ?жане базе за пÑ?еÑ?Ñ?агÑ?"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS Ñ?иÑ?Ñ?оваÑ?е"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"Ð?аза за пÑ?еÑ?Ñ?агÑ? Ñ?е поÑ?ебно име (DN) Ñ?ноÑ?а одакле Ñ?е Ð?аÑ?а пÑ?еÑ?Ñ?ага поÑ?еÑ?и. "
-"Ð?ко ово оÑ?Ñ?авиÑ?е пÑ?азно, пÑ?еÑ?Ñ?ага Ñ?е поÑ?еÑ?и из коÑ?ена Ñ?Ñ?абла диÑ?екÑ?оÑ?иÑ?Ñ?ма."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Ð?бим пÑ?еÑ?Ñ?аге деÑ?иниÑ?е дÑ?бинÑ? коÑ?ом желиÑ?е да пÑ?еÑ?Ñ?ага обÑ?Ñ?ваÑ?и Ñ?Ñ?абло "
-"диÑ?екÑ?оÑ?иÑ?Ñ?ма. Ð?бим пÑ?еÑ?Ñ?аге â??подâ?? Ñ?е Ñ?кÑ?Ñ?Ñ?иÑ?и Ñ?ве Ñ?ноÑ?е иÑ?под базе за "
-"пÑ?еÑ?Ñ?агÑ?. Ð?бим пÑ?еÑ?Ñ?аге â??Ñ?еданâ?? Ñ?е Ñ?кÑ?Ñ?Ñ?иÑ?и Ñ?амо Ñ?ноÑ?е Ñ?едан ниво иÑ?под Ð?аÑ?е "
-"базе."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Ð?во Ñ?е пÑ?но име ваÑ?ег ldap Ñ?еÑ?веÑ?а. Ð?а пÑ?имеÑ?, â??ldap.mojepreduzece.comâ??."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Ð?во Ñ?е наÑ?веÑ?и бÑ?оÑ? Ñ?ноÑ?а за пÑ?еÑ?зимаÑ?е. Ð?ко Ñ?неÑ?еÑ?е Ñ?Ñ?виÑ?е велики бÑ?оÑ? "
-"Ñ?Ñ?поÑ?иÑ?еÑ?е именик."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Ð?волÑ?Ñ?иÑ?а Ñ?е коÑ?иÑ?Ñ?иÑ?и оваÑ? меÑ?од да ваÑ? пÑ?иÑ?ави.  Ð?Ñ?имеÑ?иÑ?е да Ñ?егово "
-"Ñ?кÑ?Ñ?Ñ?иваÑ?е на â??Ð?лекÑ?Ñ?онÑ?ка адÑ?еÑ?аâ?? заÑ?Ñ?ева анонимни пÑ?иÑ?Ñ?Ñ?п на ldap Ñ?еÑ?веÑ?."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Ð?во Ñ?е име Ñ?еÑ?веÑ?а коÑ?е Ñ?е Ñ?е поÑ?авиÑ?и Ñ? лиÑ?Ñ?и Ñ?аÑ?Ñ?икли Ð?волÑ?Ñ?иÑ?е. То Ñ?е "
-"Ñ?амо за поÑ?Ñ?ебе пÑ?иказиваÑ?а. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Ð?во Ñ?е поÑ?Ñ? LDAP Ñ?еÑ?веÑ?а на коÑ?и Ñ?е Ð?волÑ?Ñ?иÑ?а покÑ?Ñ?аÑ?и да Ñ?е повеже. "
-"Ð?онÑ?Ñ?ена Ñ?е лиÑ?Ñ?а Ñ?Ñ?андаÑ?дниÑ? поÑ?Ñ?ова. Ð?иÑ?аÑ?Ñ?е Ñ?вог админиÑ?Ñ?Ñ?аÑ?оÑ?а Ñ?иÑ?Ñ?ема "
-"коÑ?и поÑ?Ñ? да наведеÑ?е."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Ð?оÑ?иÑ?Ñ?еÑ?е поÑ?ебног имена (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Ð?оÑ?иÑ?Ñ?еÑ?е елекÑ?Ñ?онÑ?ке адÑ?еÑ?е"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Ð?ад год Ñ?е могÑ?Ñ?е"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Ð?одаÑ? именик"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Ð?гÑ?аниÑ?еÑ?е за _пÑ?еÑ?зимаÑ?е:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "_Ð?аÑ?и могÑ?Ñ?е базе за пÑ?еÑ?Ñ?агÑ?"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "Ð?еÑ?од _пÑ?иÑ?аве:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ð?ме:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Ð?оÑ?Ñ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "Ð?бим п_Ñ?еÑ?Ñ?аге:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "С_еÑ?веÑ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Рок:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?игÑ?Ñ?нÑ? везÑ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "каÑ?Ñ?е"
 
 # bug: plural-forms
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "минÑ?Ñ?а"
 
@@ -1358,44 +1203,43 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разно</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#| msgid "<b>Home</b>"
+msgid "<b>Notes</b>"
+msgstr "<b>Ð?апомене</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Ð?Ñ?Ñ?ало</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>ТелеÑ?он</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Ð?еб адÑ?еÑ?е</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Ð?оÑ?ао</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ð?а_Ñ?егоÑ?иÑ?е..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Ð?онÑ?акÑ?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "УÑ?еÑ?иваÑ? за конÑ?акÑ?е"
 
@@ -1404,1277 +1248,260 @@ msgid "Full _Name..."
 msgstr "Ð?Ñ?но _име..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 msgid "Image"
 msgstr "Слика"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN глаÑ?ник"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Ð?дÑ?еÑ?а Ñ?Ñ?ановаÑ?а"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "Ð?а_димак:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Ð?апомене"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Ð?иÑ?ни подаÑ?и"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "ТелеÑ?он"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "Ð?оÑ?ао"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Ð?дÑ?еÑ?а:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Ð?одиÑ?Ñ?иÑ?а:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Ð?омоÑ?ник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_РоÑ?ендан:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Ð?алендаÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Ð?Ñ?ад:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "Ð?Ñ?_едÑ?зеÑ?е:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Ð?Ñ?жава:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Ð?деÑ?еÑ?е:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "СмеÑ?Ñ?и _под:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "С_лободно/заÑ?зеÑ?о:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Ð?иÑ?на Ñ?Ñ?Ñ?ана:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
-msgstr "_УпÑ?авник:"
+msgstr "_РÑ?ководилаÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "_Ð?елеÑ?ке:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Ð?анÑ?елаÑ?иÑ?а:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Ð?оÑ?Ñ?анÑ?ки бÑ?оÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Ð?анимаÑ?е:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "С_Ñ?пÑ?Ñ?жник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_РепÑ?блика/покÑ?аÑ?ина:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
-msgstr "_ТиÑ?Ñ?ла:"
+msgstr "_Ð?ваÑ?е:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Ð?идео Ñ?азговоÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "_Ð?ели да пÑ?има HTML поÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Ð?еб лог:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Ð?де:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "Ð?оÑ?_Ñ?анÑ?ки бÑ?оÑ?:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "Ð?дÑ?еÑ?а"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Ð?ме"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1827 ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
+#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Ð?зменÑ?иво"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "СÑ?едиÑ?ене Ð?Ñ?жаве"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "Ð?вганиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "Ð?лбаниÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "Ð?лжиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "Ð?меÑ?иÑ?ка Самоа"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Ð?ндоÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Ð?нгола"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Ð?нгила"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "Ð?нÑ?аÑ?кÑ?ик"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "Ð?нÑ?ига и Ð?аÑ?бÑ?да"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Ð?Ñ?генÑ?ина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "Ð?еÑ?мениÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Ð?Ñ?Ñ?ба"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?алиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "Ð?зеÑ?беÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Ð?аÑ?ами"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Ð?аÑ?Ñ?еин"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Ð?англадеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Ð?аÑ?бадоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "Ð?елоÑ?Ñ?Ñ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "Ð?елгиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Ð?елизе"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Ð?енин"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Ð?еÑ?мÑ?да"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "Ð?Ñ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "Ð?оливиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "Ð?оÑ?на и ХеÑ?Ñ?еговина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Ð?оÑ?вана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Ð?Ñ?ве Ð?Ñ?Ñ?Ñ?во"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Ð?Ñ?азил"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "Ð?Ñ?иÑ?анÑ?ка ТеÑ?иÑ?оÑ?иÑ?а Ð?ндиÑ?Ñ?ког Ð?кеана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "Ð?Ñ?Ñ?неÑ? Ð?аÑ?Ñ?Ñ?алам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "Ð?Ñ?гаÑ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "Ð?Ñ?Ñ?кина ФаÑ?о"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "Ð?Ñ?Ñ?Ñ?нди"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Ð?амбоÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "Ð?амеÑ?Ñ?н"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "Ð?анада"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "Ð?еленоÑ?Ñ?Ñ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "Ð?аÑ?манÑ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "ЦенÑ?Ñ?алноаÑ?Ñ?иÑ?ка РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Чад"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Чиле"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "Ð?ина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "Ð?ожиÑ?но Ð?Ñ?Ñ?Ñ?во"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Ð?окоÑ? (Ð?илинг) Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "Ð?олÑ?мбиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Ð?омоÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Ð?онго"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Ð?онго, Ð?емокÑ?аÑ?Ñ?ка РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Ð?Ñ?к Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "Ð?оÑ?Ñ?аÑ?ика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "Ð?бала СлоноваÑ?е"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "Ð¥Ñ?ваÑ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Ð?Ñ?ба"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Ð?ипаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "ЧеÑ?ка РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Ð?анÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Ð?ибÑ?Ñ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Ð?оминика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "Ð?оминиканÑ?ка РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "Ð?квадоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Ð?гипаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "Ð?л СалвадоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "Ð?кваÑ?оÑ?иÑ?ална Ð?винеÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "Ð?Ñ?иÑ?Ñ?еÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "Ð?Ñ?Ñ?ониÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "Ð?Ñ?иопиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "ФокландÑ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "ФаÑ?Ñ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "ФиÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "ФинÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "ФÑ?анÑ?Ñ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "ФÑ?анÑ?Ñ?Ñ?ка Ð?иÑ?ана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "ФÑ?анÑ?Ñ?Ñ?ка Ð?олинезиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "ФÑ?анÑ?Ñ?Ñ?ке Ð?Ñ?жне ТеÑ?иÑ?оÑ?иÑ?е"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "Ð?абон"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "Ð?амбиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "Ð?Ñ?Ñ?зиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "Ð?емаÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Ð?ана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Ð?ибÑ?алÑ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "Ð?Ñ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "Ð?Ñ?енланд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Ð?Ñ?енада"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Ð?вадалÑ?п"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Ð?Ñ?ам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Ð?ваÑ?емала"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Ð?виÑ?нзи"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "Ð?винеÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "Ð?винеÑ?а-Ð?иÑ?ао"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Ð?ваÑ?ана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "ХаиÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "ХеÑ?д и Ð?екдоналд Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "СвеÑ?а СÑ?олиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "ХондÑ?Ñ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "Хонг Ð?онг"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "Ð?аÑ?аÑ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "Ð?Ñ?ланд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "Ð?ндиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "Ð?ндонезиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "Ð?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Ð?Ñ?ак"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Ð?Ñ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Човеково Ð?Ñ?Ñ?Ñ?во"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Ð?зÑ?аел"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "Ð?Ñ?алиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Ð?амаÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "Ð?апан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Ð?еÑ?Ñ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "Ð?оÑ?дан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "Ð?азаÑ?Ñ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "Ð?ениÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Ð?иÑ?ибаÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Ð?оÑ?еÑ?а, Ð?емокÑ?аÑ?Ñ?ка Ð?аÑ?одна РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "Ð?оÑ?еÑ?а, РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Ð?Ñ?ваÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "Ð?иÑ?гиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Ð?аоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "Ð?аÑ?виÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "Ð?ибан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Ð?еÑ?оÑ?о"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "Ð?ибеÑ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "Ð?ибиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Ð?иÑ?Ñ?енÑ?Ñ?аÑ?н"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "Ð?иÑ?ваниÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Ð?Ñ?кÑ?ембÑ?Ñ?г"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Ð?акао"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "Ð?акедониÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Ð?адагаÑ?каÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Ð?алави"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "Ð?алезиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Ð?алдиви"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Ð?али"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Ð?алÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Ð?аÑ?Ñ?алова Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Ð?аÑ?Ñ?иник"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "Ð?аÑ?Ñ?иÑ?аниÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "Ð?аÑ?Ñ?иÑ?иÑ?Ñ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Ð?еÑ?оÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "Ð?екÑ?ико"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "Ð?икÑ?онезиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "Ð?олдавиÑ?а, РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "Ð?онако"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "Ð?онголиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Ð?онÑ?еÑ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Ð?аÑ?око"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "Ð?озамбик"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Ð?ианмаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "Ð?амибиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Ð?аÑ?Ñ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Ð?епал"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "ХоландиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "ХоландÑ?ки Ð?нÑ?или"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "Ð?ова Ð?аледониÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "Ð?ови Ð?еланд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "Ð?икаÑ?агва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Ð?игеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "Ð?игеÑ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Ð?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Ð?оÑ?Ñ?олк Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "Ð?Ñ?Ñ?Ñ?ва СевеÑ?на Ð?аÑ?иана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Ð?оÑ?веÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "Ð?ман"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "Ð?акиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Ð?алаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "Ð?алеÑ?Ñ?инÑ?ка ТеÑ?иÑ?оÑ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "Ð?анама"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Ð?апÑ?а Ð?ова Ð?винеÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Ð?аÑ?агваÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Ð?еÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "Филипини"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Ð?иÑ?кеÑ?н"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "Ð?оÑ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Ð?оÑ?Ñ?Ñ?гал"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "Ð?оÑ?Ñ?оÑ?ико"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "Ð?аÑ?аÑ?"
-
-# Ð?а овÑ? дÑ?жавÑ? ниÑ?ам Ñ?Ñ?о ни Ñ? Ñ?нÑ?, Ñ?ако да Ñ?ам оÑ?Ñ?авио Ñ? оÑ?игиналÑ?. -- Ð?а када Ñ?и необÑ?азован. :)
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "РеÑ?нион"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "РÑ?мÑ?ниÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "РÑ?Ñ?ка ФедеÑ?аÑ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "РÑ?анда"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "СвеÑ?и Ð?иÑ?Ñ? и Ð?евиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "СвеÑ?а Ð?Ñ?Ñ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "СвеÑ?и Ð?инÑ?енÑ? и Ð?Ñ?енадини"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Самоа"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "Сан Ð?аÑ?ино"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "Сао Томе и Ð?Ñ?инÑ?ипе"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "СаÑ?диÑ?Ñ?ка Ð?Ñ?абиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "Сенегал"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "СÑ?биÑ?а и ЦÑ?на Ð?оÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "СеÑ?Ñ?ели"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "СиÑ?еÑ?а Ð?еоне"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "СингапÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "СловаÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "СловениÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "СоломонÑ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "СомалиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "Ð?Ñ?жна Ð?Ñ?Ñ?ика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "Ð?Ñ?жна Ð?оÑ?Ñ?иÑ?а и Ð?Ñ?жна СендвиÑ? Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "ШпаниÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "ШÑ?и Ð?анка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "Св. Ð?елена"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "Св. Ð?Ñ?еÑ? и Ð?икелон"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "СÑ?дан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "СÑ?Ñ?инам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "СвалбаÑ?д и Ð?ан Ð?аÑ?ен Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "Свазиленд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "ШведÑ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "ШваÑ?Ñ?аÑ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "СиÑ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "ТаÑ?ван"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "ТаÑ?икиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "ТанзаниÑ?а, УÑ?едиÑ?ена РепÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "ТаÑ?ланд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "ТимоÑ?-Ð?еÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "Того"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "ТокелаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Тонга"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "ТÑ?инидад и Тобаго"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "ТÑ?ниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "ТÑ?Ñ?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "ТÑ?Ñ?кмениÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "ТÑ?Ñ?кÑ? и Ð?окоÑ? Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "ТÑ?валÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Уганда"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "УкÑ?аÑ?ина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "УÑ?едиÑ?ени Ð?Ñ?апÑ?ки Ð?миÑ?аÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "Ð?елика Ð?Ñ?иÑ?аниÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "РÑ?бна Ð?Ñ?Ñ?Ñ?ва СÐ?Ð?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "УÑ?Ñ?гваÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "УзбекиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Ð?анÑ?аÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Ð?енеÑ?Ñ?ела"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "Ð?иÑ?еÑ?нам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "Ð?Ñ?иÑ?анÑ?ка Ð?евиÑ?анÑ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "Ð?меÑ?иÑ?ка Ð?евиÑ?анÑ?ка Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Ð?олиÑ? и ФÑ?Ñ?Ñ?на Ð?Ñ?Ñ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "Ð?ападна СаÑ?аÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "Ð?емен"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "Ð?амбиÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "Ð?имбабве"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:475
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Ð?ме"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL бÑ?зи глаÑ?ник"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Ð?абеÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo глаÑ?ник"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu'Gadu глаÑ?ник"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "СкаÑ?п"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "СеÑ?виÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Ð?еÑ?Ñ?о"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "Ð?оÑ?иÑ?ниÑ?ко име"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Ð?оÑ?ао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Ð?Ñ?Ñ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?го"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Ð?звоÑ?на кÑ?ига"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Ð?дÑ?едиÑ?на кÑ?ига"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Ð?е нови конÑ?акÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Ð?оÑ?а за Ñ?пиÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Ð?бавезна поÑ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Ð?Ñ?омеÑ?ено"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "УÑ?еÑ?иваÑ? за конÑ?акÑ?е - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Ð?забеÑ?иÑ?е Ñ?ликÑ? за оваÑ? конÑ?акÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Ð?ез Ñ?лике"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2682,45 +1509,45 @@ msgstr ""
 "Ð?одаÑ?и о конÑ?акÑ?Ñ? ниÑ?Ñ? иÑ?пÑ?авни:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ?? има неважеÑ?и Ñ?оÑ?маÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ?? има неважеÑ?и Ñ?оÑ?маÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ?? Ñ?е пÑ?азан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Ð?еиÑ?пÑ?аван конÑ?акÑ?."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Ð?Ñ?зо додаваÑ?е конÑ?акÑ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_УÑ?еди поÑ?пÑ?но"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Ð?ме и пÑ?езиме"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "Ð?-_поÑ?Ñ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
-msgstr "_Ð?забеÑ?и именик"
+msgstr "_Ð?забеÑ?и адÑ?еÑ?аÑ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
@@ -2756,111 +1583,61 @@ msgstr ""
 "Ð?еÑ?Ñ?е ли Ñ?игÑ?Ñ?ни да Ñ?оÑ?еÑ?е\n"
 "да обÑ?иÑ?еÑ?е ове конÑ?акÑ?е?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Ð?дÑ?еÑ?а _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Ð?Ñ?ад:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "Ð?Ñ?жав_а:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Ð?Ñ?на адÑ?еÑ?а"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "_Ð?оÑ?Ñ?анÑ?ки бÑ?оÑ?:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Ð?Ñ?"
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Ð?.\n"
+"Ð?-Ñ?а.\n"
+"Ð?-Ñ?а.\n"
+"Ð?-Ñ?иÑ?а\n"
+"Ð?Ñ?."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Ð?оÑ?."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"СÑ?.\n"
+"Ð?л.\n"
+"I\n"
+"II\n"
+"III\n"
+"Ð?оÑ?."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Ð?Ñ?но име"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Ð?л."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Ð?-Ñ?иÑ?а"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Ð?."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Ð?-Ñ?а"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ð?-Ñ?а"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "СÑ?."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Ð?ме:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Ð?Ñ?езиме:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_СÑ?едÑ?е:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_СÑ?Ñ?икÑ?:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Ð?одаÑ? налог бÑ?зог глаÑ?ника"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "Ð?ме н_алога:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "УÑ?лÑ?га _бÑ?зог глаÑ?ника:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_Ð?еÑ?Ñ?о:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Чланови:</b>"
@@ -2871,9 +1648,9 @@ msgid "Contact List Editor"
 msgstr "УÑ?еÑ?иваÑ? конÑ?акÑ? лиÑ?Ñ?е"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Ð?забеÑ?и..."
 
@@ -2899,11 +1676,11 @@ msgid "_Members"
 msgstr "_Чланови"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Ð?Ñ?ига"
 
@@ -2925,12 +1702,8 @@ msgid "Duplicate Contact Detected"
 msgstr "Ð?Ñ?кÑ?ивен дÑ?пли конÑ?акÑ?"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
-msgstr ""
-"Ð?ме или елекÑ?Ñ?онÑ?ка адÑ?еÑ?а овог конÑ?акÑ?а веÑ? поÑ?Ñ?оÑ?и Ñ? овоÑ? Ñ?аÑ?Ñ?икли.  "
-"Ð?елиÑ?е ли ипак да га додаÑ?е?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+msgstr "Ð?ме или елекÑ?Ñ?онÑ?ка адÑ?еÑ?а овог конÑ?акÑ?а веÑ? поÑ?Ñ?оÑ?и Ñ? овоÑ? Ñ?аÑ?Ñ?икли.  Ð?елиÑ?е ли ипак да га додаÑ?е?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2949,28 +1722,31 @@ msgstr ""
 "Ñ? овоÑ? Ñ?аÑ?Ñ?икли.  Ð?елиÑ?е ли ипак да додаÑ?е?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Ð?Ñ?ипоÑ?и"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Ð?Ñ?ипоÑ?и конÑ?акÑ?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420
+#: ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "Ð?-поÑ?Ñ?а"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Ð?оÑ?е коÑ?е Ñ?адÑ?жи"
 
@@ -2983,11 +1759,11 @@ msgstr "Ð?-поÑ?Ñ?а поÑ?иÑ?е Ñ?а"
 msgid "Name contains"
 msgstr "Ð?ме Ñ?адÑ?жи"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Ð?ема конÑ?акÑ?а"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2995,24 +1771,25 @@ msgstr[0] "%d конÑ?акÑ?"
 msgstr[1] "%d конÑ?акÑ?а"
 msgstr[2] "%d конÑ?акаÑ?а"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "УпиÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?иÑ?аваÑ?Ñ? пÑ?егледа кÑ?иге"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817
+#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Ð?одел"
 
@@ -3029,105 +1806,111 @@ msgid "Source"
 msgstr "Ð?звоÑ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Тип"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "ЧÑ?ва као вÐ?аÑ?Ñ?Ñ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ð?Ñ?воÑ?и"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "Ð?ови кон_Ñ?акÑ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "Ð?ови конÑ?акÑ? _Ñ?пиÑ?ак..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_СаÑ?Ñ?ваÑ? као вÐ?аÑ?Ñ?Ñ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "Ð?Ñ?оÑ?ле_ди конÑ?акÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "Ð?Ñ?оÑ?леди конÑ?_акÑ?е"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? ко_нÑ?акÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? на _лиÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Ð?оÑ?аÑ?и по_Ñ?Ñ?кÑ? конÑ?акÑ?има"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "ШÑ?а_мпаÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
-msgstr "Умножи Ñ? и_меник..."
+msgstr "Умнож_и Ñ? адÑ?еÑ?аÑ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "Ð?Ñ?емеÑ?Ñ?и Ñ? имени_к..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "_Ð?Ñ?еÑ?и"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813
+#: ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991
+#: ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109
+#: ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "_УбаÑ?и"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624
+#: ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Ð?ило коÑ?а каÑ?егоÑ?иÑ?а"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628
+#: ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "Ð?е одговаÑ?а"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Ð?омоÑ?ник"
 
@@ -3156,8 +1939,8 @@ msgid "Car Phone"
 msgstr "ТелеÑ?он Ñ? колима"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3165,7 +1948,7 @@ msgid "Categories"
 msgstr "Ð?аÑ?егоÑ?иÑ?е"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Ð?Ñ?едÑ?зеÑ?е"
 
@@ -3214,22 +1997,22 @@ msgid "Journal"
 msgstr "Ð?невник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
-msgstr "УпÑ?авник"
+msgstr "РÑ?ководилаÑ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Ð?обилни Ñ?елеÑ?он"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Ð?адимак"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Ð?апомена"
 
@@ -3258,14 +2041,14 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Улога"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "СÑ?пÑ?Ñ?жник"
 
@@ -3295,55 +2078,61 @@ msgstr "Ð?единиÑ?а"
 msgid "Web Site"
 msgstr "Ð?еб Ñ?Ñ?Ñ?ана"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83
+#: ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421
+#: ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../widgets/table/e-table-item.c:3069
+#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "ШиÑ?ина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95
+#: ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428
+#: ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740
+#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Ð?иÑ?ина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ð?ма Ñ?окÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Ð?оÑ?е"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Ð?ме поÑ?а"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Ð?одел Ñ?екÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Ð?аÑ?веÑ?а дÑ?жина имена поÑ?а"
 
@@ -3351,7 +2140,7 @@ msgstr "Ð?аÑ?веÑ?а дÑ?жина имена поÑ?а"
 msgid "Column Width"
 msgstr "ШиÑ?ина колоне"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3361,7 +2150,7 @@ msgstr ""
 "\n"
 "ТÑ?ажим конÑ?акÑ?е..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3375,7 +2164,7 @@ msgstr ""
 "\n"
 "или кликниÑ?е двапÑ?Ñ? овде за пÑ?авÑ?еÑ?е новог конÑ?акÑ?а."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3385,11 +2174,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Ð?ема пÑ?едмеÑ?а за пÑ?иказиваÑ?е.\n"
+"Ð?ема Ñ?Ñ?авки за пÑ?иказиваÑ?е.\n"
 "\n"
 "Ð?ликниÑ?е двапÑ?Ñ? да напÑ?авиÑ?е нов конÑ?акÑ?."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3399,7 +2188,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?еÑ?Ñ?ага за конÑ?акÑ?има."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3407,43 +2196,45 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Ð?ема пÑ?едмеÑ?а за пÑ?иказиваÑ?е."
+"Ð?ема Ñ?Ñ?авки за пÑ?иказиваÑ?е."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Ð?дапÑ?еÑ?"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
-msgstr "Ð?оÑ?лобна е-поÑ?Ñ?а"
+msgstr "Ð?оÑ?ловна е-поÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Ð?Ñ?Ñ?на е-поÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Ð?Ñ?Ñ?га е-поÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Ð?забÑ?ано"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ð?ма кÑ?Ñ?Ñ?оÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Ð?Ñ?воÑ?и везÑ? Ñ? Ñ?иÑ?аÑ?Ñ?"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Умножи меÑ?Ñ?о везе"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? за..."
 
@@ -3452,96 +2243,101 @@ msgstr "_Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? за..."
 msgid "Copy _Email Address"
 msgstr "Умножи елекÑ?Ñ?онÑ?кÑ? _адÑ?еÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(мапа)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "мапа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Чланови лиÑ?Ñ?е"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "_Ð?деÑ?еÑ?е:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "_Ð?анимаÑ?е:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Ð?оложаÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "_Ð?идео Ñ?азговоÑ?:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Ð?алендаÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Слободно/заÑ?зеÑ?о"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "ТелеÑ?он"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "ФакÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Ð?дÑ?еÑ?а"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "_Ð?иÑ?на Ñ?Ñ?Ñ?ана:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "_Ð?еб лог:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "_РоÑ?ендан:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "_Ð?одиÑ?Ñ?иÑ?а:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
-msgstr "ТиÑ?Ñ?ла на поÑ?лÑ?"
+msgstr "Ð?ваÑ?е на поÑ?лÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Ð?иÑ?на Ñ?Ñ?Ñ?аниÑ?а"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Ð?лог"
 
@@ -3565,7 +2361,7 @@ msgstr "Ð?Ñ?Ñ?ива ван мÑ?еже"
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
-msgstr "Ð?меник не поÑ?Ñ?оÑ?и"
+msgstr "Ð?дÑ?еÑ?аÑ? не поÑ?Ñ?оÑ?и"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
@@ -3599,12 +2395,12 @@ msgstr "Ð?Ñ?оÑ?окол ниÑ?е подÑ?жан"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661
+#: ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Ð?Ñ?казано"
 
@@ -3615,13 +2411,13 @@ msgstr "Ð?иÑ?е могÑ?Ñ?е одÑ?Ñ?Ñ?аÑ?и"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?а обавезна"
 
@@ -3658,40 +2454,21 @@ msgid "Unsupported authentication method"
 msgstr "Ð?еÑ?од аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е ниÑ?е подÑ?жан"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Ð?е могÑ? да оÑ?воÑ?им оваÑ? адÑ?еÑ?аÑ?. То знаÑ?и да он или ниÑ?е ознаÑ?ен за "
-"коÑ?иÑ?Ñ?еÑ?е ван мÑ?еже или да Ñ?оÑ? ниÑ?е пÑ?еÑ?зеÑ? за Ñ?ад ван мÑ?еже. УÑ?иÑ?аÑ?Ñ?е "
-"адÑ?еÑ?аÑ? када Ñ?е повежеÑ?е Ñ?ади пÑ?еÑ?зимаÑ?а Ñ?еговог Ñ?адÑ?жаÑ?а."
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "Ð?е могÑ? да оÑ?воÑ?им оваÑ? адÑ?еÑ?аÑ?. То знаÑ?и да он или ниÑ?е ознаÑ?ен за коÑ?иÑ?Ñ?еÑ?е ван мÑ?еже или да Ñ?оÑ? ниÑ?е пÑ?еÑ?зеÑ? за Ñ?ад ван мÑ?еже. УÑ?иÑ?аÑ?Ñ?е адÑ?еÑ?аÑ? када Ñ?е повежеÑ?е Ñ?ади пÑ?еÑ?зимаÑ?а Ñ?еговог Ñ?адÑ?жаÑ?а."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е овог адÑ?еÑ?аÑ?а.  Ð?Ñ?овеÑ?иÑ?е да пÑ?Ñ?аÑ?а %s поÑ?Ñ?оÑ?и и да "
-"имаÑ?е пÑ?ава пÑ?иÑ?Ñ?Ñ?па."
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е овог адÑ?еÑ?аÑ?а.  Ð?Ñ?овеÑ?иÑ?е да пÑ?Ñ?аÑ?а %s поÑ?Ñ?оÑ?и и да имаÑ?е пÑ?ава пÑ?иÑ?Ñ?Ñ?па."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:131
-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."
+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:140
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е овог адÑ?еÑ?аÑ?а.  То знаÑ?и да Ñ?Ñ?е или Ñ?нели погÑ?еÑ?нÑ? "
-"адÑ?еÑ?Ñ?, или Ñ?е Ñ?еÑ?веÑ? недоÑ?Ñ?Ñ?пан."
+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:148
 msgid "Detailed error message:"
@@ -3710,7 +2487,6 @@ msgstr ""
 "бÑ?оÑ?а Ñ?езÑ?лÑ?аÑ?а Ñ? поÑ?Ñ?авкама адÑ?еÑ?аÑ?а за Ñ?еÑ?веÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ма."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
-#, fuzzy
 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"
@@ -3718,9 +2494,9 @@ msgid ""
 "preferences for this address book."
 msgstr ""
 "Ð?Ñ?еме за извÑ?Ñ?аваÑ?е овог Ñ?пиÑ?а Ñ?е пÑ?еко огÑ?аниÑ?еÑ?а Ñ?еÑ?веÑ?а или\n"
-"огÑ?аниÑ?еÑ?а коÑ?и Ñ?Ñ?е подеÑ?или за оваÑ? адÑ?еÑ?аÑ?.  Ð?Ñ?еÑ?изниÑ?е обликÑ?Ñ?Ñ?е\n"
-"Ñ?пиÑ? или повеÑ?аÑ?Ñ?е вÑ?еменÑ?ко огÑ?аниÑ?еÑ?е Ñ? поÑ?Ñ?авкама адÑ?еÑ?аÑ?а\n"
-"за Ñ?еÑ?веÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ма."
+"огÑ?аниÑ?еÑ?а коÑ?и Ñ?Ñ?е подеÑ?или за оваÑ? адÑ?еÑ?аÑ?. Ð?Ñ?еÑ?изниÑ?е обликÑ?Ñ?Ñ?е\n"
+"Ñ?пиÑ? или повеÑ?аÑ?Ñ?е вÑ?еменÑ?ко огÑ?аниÑ?еÑ?е Ñ? поÑ?Ñ?авкама Ñ?еÑ?веÑ?а\n"
+"диÑ?екÑ?оÑ?иÑ?Ñ?ма за оваÑ? адÑ?еÑ?аÑ?."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
@@ -3739,7 +2515,7 @@ msgid "Error adding list"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и додаваÑ?Ñ? лиÑ?Ñ?е"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и додаваÑ?Ñ? конÑ?акÑ?а"
 
@@ -3756,7 +2532,7 @@ msgid "Error removing list"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?клаÑ?аÑ?Ñ? лиÑ?Ñ?е"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?клаÑ?аÑ?Ñ? конÑ?акÑ?а"
 
@@ -3787,7 +2563,7 @@ msgid "Display _All Contacts"
 msgstr "Ð?Ñ?икажи _Ñ?ве конÑ?акÑ?е"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3796,15 +2572,15 @@ msgstr ""
 "%s веÑ? поÑ?Ñ?оÑ?и\n"
 "Ð?елиÑ?е ли да пÑ?епиÑ?еÑ?е?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Ð?Ñ?епиÑ?и"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "конÑ?акÑ?"
@@ -3812,31 +2588,31 @@ msgstr[1] "конÑ?акÑ?и"
 msgstr[2] "конÑ?акÑ?а"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
-msgstr "Ð?забеÑ?и именик"
+msgstr "Ð?забеÑ?и адÑ?еÑ?аÑ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "лиÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Ð?Ñ?емеÑ?Ñ?и конÑ?акÑ? Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Умножи конÑ?акÑ? Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Ð?Ñ?емеÑ?Ñ?и конÑ?акÑ?е Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Умножи конÑ?акÑ?е Ñ?"
 
@@ -3860,368 +2636,146 @@ msgstr "Ð?онÑ?акÑ?"
 msgid "Contact information for %s"
 msgstr "Ð?онÑ?акÑ? подаÑ?и за %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
-msgstr "СлаÑ?е Ñ?пиÑ?а именикÑ?..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? %d конÑ?акÑ?."
-msgstr[1] "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? %d конÑ?акÑ?а."
-msgstr[2] "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? %d конÑ?акÑ?а."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Ð?Ñ?икажи пÑ?нÑ? вÐ?аÑ?Ñ?Ñ?"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Ð?Ñ?икажи Ñ?ажеÑ?Ñ? вÐ?аÑ?Ñ?Ñ?"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "СаÑ?Ñ?ваÑ? Ñ? адÑ?еÑ?аÑ?"
+msgstr "СлаÑ?е Ñ?пиÑ?а адÑ?еÑ?аÑ?Ñ?..."
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Ð?Ñ?еглед каÑ?Ñ?е"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687
+#: ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "УвожеÑ?е..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV и Tab Ñ?возник"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Ð?озила CSV и Tab Ñ?возник"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "Evolution CSV или Tab (.csv, .tab)"
+msgstr "Ð?волÑ?Ñ?иÑ?а CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Ð?волÑ?Ñ?иÑ?ин CSV и Tab Ñ?возник"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP облик Ñ?азмене подаÑ?ака (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Ð?волÑ?Ñ?иÑ?а LDIF Ñ?возник"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "вÐ?аÑ?Ñ?а (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Ð?волÑ?Ñ?иÑ?ин Ñ?возник вÐ?аÑ?Ñ?и"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 п. ТаÑ?ома"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 п. ТаÑ?ома"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Ð?Ñ?азни обÑ?аÑ?Ñ?и на кÑ?аÑ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Тело"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Ð?но:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Ð?имензиÑ?е:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "Ф_онÑ?..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Словни лик"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Ð?одножÑ?е:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "ФоÑ?маÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Ð?аглавÑ?е"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Ð?аглавÑ?е/подножÑ?е"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Ð?аглавÑ?а"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Ð?аглавÑ?а за Ñ?вако пиÑ?мо"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Ð?иÑ?ина:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Ð?дмаÑ? пÑ?аÑ?и Ñ?едно дÑ?Ñ?го"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Ð?оложено"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Ð?ево:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Ð?езиÑ?Ñ?и Ñ?а Ñ?ловима Ñ?а Ñ?Ñ?Ñ?ане"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Ð?аÑ?гине"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Ð?Ñ?оÑ? колона:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Ð?пÑ?иÑ?е"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Ð?оложаÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "СÑ?Ñ?ана"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Ð?одеÑ?аваÑ?е Ñ?Ñ?Ñ?ане:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Ð?апиÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Ð?звоÑ? папиÑ?а:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "УÑ?пÑ?авно"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Ð?Ñ?еглед:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ШÑ?ампаÑ? коÑ?иÑ?Ñ?еÑ?и Ñ?иве Ñ?онове"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Ð?бÑ?нÑ?Ñ?о на паÑ?ним Ñ?Ñ?Ñ?анама"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Ð?еÑ?но:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Ð?деÑ?Ñ?и:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "СенÑ?еÑ?е"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Ð?елиÑ?ина:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Ð?оÑ?ни на новоÑ? Ñ?Ñ?Ñ?ани"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Ð?ме Ñ?Ñ?ила:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Ð?Ñ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "ШиÑ?ина:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Словни лик..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Ð?аÑ?оÑ?ека не може биÑ?и оÑ?воÑ?ена"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "Ð?иÑ?Ñ?а адÑ?еÑ?аÑ?а ниÑ?е доÑ?Ñ?Ñ?пна"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "неÑ?Ñ?пело оÑ?ваÑ?аÑ?е кÑ?иге"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Ð?аведиÑ?е излазнÑ? даÑ?оÑ?екÑ? Ñ?меÑ?Ñ?о Ñ?Ñ?андаÑ?дног излаза"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?-Ð?Ð?ТÐ?ТÐ?Ð?Ð?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
-msgstr "Ð?иÑ?Ñ?а Ñ?аÑ?Ñ?икли локалног адÑ?еÑ?аÑ?а"
+msgstr "СпиÑ?ак Ñ?аÑ?Ñ?икли локалног адÑ?еÑ?аÑ?а"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Ð?Ñ?икажи каÑ?Ñ?е као вкаÑ?Ñ?Ñ? или csv даÑ?оÑ?екÑ?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Ð?звези Ñ? неÑ?Ñ?клаÑ?еном Ñ?ежимÑ?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Ð?Ñ?оÑ? каÑ?Ñ?и Ñ? Ñ?едноÑ? излазноÑ? даÑ?оÑ?еÑ?и Ñ? неÑ?Ñ?клаÑ?еном Ñ?ежимÑ?, подÑ?азÑ?мевана "
-"велиÑ?ина 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:59
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "Ð?Ñ?оÑ? каÑ?Ñ?и Ñ? Ñ?едноÑ? излазноÑ? даÑ?оÑ?еÑ?и Ñ? неÑ?Ñ?клаÑ?еном Ñ?ежимÑ?, подÑ?азÑ?мевана велиÑ?ина 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "Ð?РÐ?Ð?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Ð?Ñ?еÑ?ка Ñ? аÑ?гÑ?менÑ?има команде, коÑ?иÑ?Ñ?иÑ?е опÑ?иÑ?Ñ? --help да видиÑ?е како Ñ?е "
-"коÑ?иÑ?Ñ?и."
+#: ../addressbook/tools/evolution-addressbook-export.c:99
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Ð?Ñ?еÑ?ка Ñ? аÑ?гÑ?менÑ?има команде, коÑ?иÑ?Ñ?иÑ?е опÑ?иÑ?Ñ? --help да видиÑ?е како Ñ?е коÑ?иÑ?Ñ?и."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Ð?одÑ?жава Ñ?амо csv или vcard облик."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "У неÑ?Ñ?клаÑ?еном Ñ?ежимÑ?, излаз моÑ?а биÑ?и даÑ?оÑ?ека."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "У ноÑ?малном Ñ?ежимÑ?, нема поÑ?Ñ?ебе за подеÑ?аваÑ?ем велиÑ?ине."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Ð?епознаÑ?а гÑ?еÑ?ка"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"Ð?алендаÑ? â??{0}â?? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е и ниÑ?е подложан изменама. Ð?забеÑ?иÑ?е дÑ?Ñ?ги "
-"календаÑ? Ñ?а боÑ?не Ñ?Ñ?аке Ñ? погледÑ? Ð?алендаÑ?а."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgstr "Ð?алендаÑ? â??{0}â?? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е и ниÑ?е подложан изменама. Ð?забеÑ?иÑ?е дÑ?Ñ?ги календаÑ? Ñ?а боÑ?не Ñ?Ñ?аке Ñ? пÑ?егледÑ? календаÑ?а."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"Ð?алендаÑ? â??{0}â?? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е и ниÑ?е га могÑ?Ñ?е меÑ?аÑ?и. Ð?забеÑ?иÑ?е дÑ?Ñ?ги "
-"календаÑ? коÑ?и пÑ?иÑ?ваÑ?а заказиваÑ?е."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "Ð?алендаÑ? â??{0}â?? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е и ниÑ?е га могÑ?Ñ?е меÑ?аÑ?и. Ð?забеÑ?иÑ?е дÑ?Ñ?ги календаÑ? коÑ?и пÑ?иÑ?ваÑ?а заказиваÑ?е."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"Ð?одаваÑ?ем Ñ?миÑ?леног кÑ?аÑ?ког опиÑ?а Ð?аÑ?ем Ñ?аÑ?Ñ?анкÑ? даÑ?еÑ?е пÑ?имаоÑ?има до знаÑ?а "
-"Ñ? вези Ñ?ега заказÑ?Ñ?еÑ?е Ñ?аÑ?Ñ?анак."
+msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "Ð?одаваÑ?ем Ñ?миÑ?леног Ñ?ажеÑ?ка заказиваÑ?Ñ? даÑ?еÑ?е пÑ?имаоÑ?има до знаÑ?а Ñ? вези Ñ?ега заказÑ?Ñ?еÑ?е."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Ð?одаваÑ?ем Ñ?миÑ?леног кÑ?аÑ?ког опиÑ?а Ð?аÑ?ем задÑ?жеÑ?Ñ? даÑ?еÑ?е пÑ?имаоÑ?има до знаÑ?а "
-"Ñ?Ñ?а Ñ?е задÑ?жеÑ?е."
+msgid "Adding a meaningful summary to your task will give your recipients 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."
@@ -4232,28 +2786,20 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Сви подаÑ?и Ñ? овоÑ? белеÑ?Ñ?и биÑ?е обÑ?иÑ?ани и неÑ?е Ñ?е моÑ?и повÑ?аÑ?иÑ?и."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Сви подаÑ?и о овим заказаним Ñ?аÑ?Ñ?анÑ?има биÑ?е обÑ?иÑ?ани и неÑ?е Ñ?е моÑ?и "
-"повÑ?аÑ?иÑ?и."
+msgid "All information on these appointments will be deleted and can not be restored."
+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 ""
-"Сви подаÑ?и о овом заказаном Ñ?аÑ?Ñ?анкÑ? Ñ?е биÑ?и обÑ?иÑ?ани и неÑ?е Ñ?е моÑ?и "
-"повÑ?аÑ?иÑ?и."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Сви подаÑ?и о овом заказиваÑ?Ñ? Ñ?е биÑ?и обÑ?иÑ?ани и неÑ?е Ñ?е моÑ?и повÑ?аÑ?иÑ?и."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Сви подаÑ?и о овом Ñ?аÑ?Ñ?анкÑ? Ñ?е биÑ?и Ñ?клоÑ?ени и неÑ?е Ñ?е моÑ?и повÑ?аÑ?иÑ?и."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4264,15 +2810,15 @@ msgstr "Сви подаÑ?и Ñ? овоÑ? белеÑ?Ñ?и Ñ?е биÑ?и Ñ?клоÑ?
 # 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 memo '{0}'?"
@@ -4281,7 +2827,7 @@ msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е белеÑ?кÑ? â??{0}
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ове {0} заказане Ñ?аÑ?Ñ?анке?"
+msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ова {0} заказиваÑ?а?"
 
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
@@ -4290,11 +2836,11 @@ msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ове {0} белеÑ?
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ова {0} задÑ?жеÑ?а?"
+msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ове {0} задаÑ?ке?"
 
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
-msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е оваÑ? заказани Ñ?аÑ?Ñ?анак?"
+msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ово заказиваÑ?е?"
 
 #: ../calendar/calendar.error.xml.h:22
 #: ../calendar/gui/dialogs/delete-comp.c:182
@@ -4312,19 +2858,19 @@ msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е оваÑ? белеÑ?к
 #: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
-msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ово задÑ?жеÑ?е?"
+msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е оваÑ? задаÑ?ак?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
-msgstr "СигÑ?Ñ?но желиÑ?е да Ñ?аÑ?Ñ?ваÑ?е белеÑ?кÑ? без Ñ?аÑ?иÑ?еног пÑ?егледа?"
+msgstr "СигÑ?Ñ?но желиÑ?е да Ñ?аÑ?Ñ?ваÑ?е белеÑ?кÑ? без Ñ?ажеÑ?ка?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "СигÑ?Ñ?но желиÑ?е да закажеÑ?е Ñ?аÑ?Ñ?анак без Ñ?аÑ?иÑ?еног пÑ?егледа?"
+msgstr "СигÑ?Ñ?но желиÑ?е да поÑ?аÑ?еÑ?е заказиваÑ?е без Ñ?ажеÑ?ка?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "СигÑ?Ñ?но желиÑ?е да поÑ?аÑ?еÑ?е задÑ?жеÑ?е без Ñ?аÑ?иÑ?еног пÑ?егледа?"
+msgstr "СигÑ?Ñ?но желиÑ?е да поÑ?аÑ?еÑ?е задаÑ?ак без Ñ?ажеÑ?ка?"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Calendar repository is offline."
@@ -4332,15 +2878,15 @@ 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}'?"
@@ -4348,7 +2894,7 @@ msgstr "Ð?бÑ?иÑ?аÑ?и Ñ?пиÑ?ак белеÑ?ки â??{0}â???"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "Ð?бÑ?иÑ?аÑ?и Ñ?пиÑ?ак задÑ?жеÑ?а â??{0}â???"
+msgstr "Ð?бÑ?иÑ?аÑ?и Ñ?пиÑ?ак задаÑ?ака â??{0}â???"
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
@@ -4356,31 +2902,24 @@ msgstr "Ð?е Ñ?аÑ?_и"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Ð?Ñ?еÑ?зимаÑ?е Ñ? Ñ?окÑ?. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е заказани Ñ?аÑ?Ñ?анак?"
+msgstr "Ð?Ñ?еÑ?зимаÑ?е Ñ? Ñ?окÑ?. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е заказиваÑ?е?"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
-msgstr "Ð?Ñ?еÑ?зимаÑ?е Ñ? Ñ?окÑ?. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е задÑ?жеÑ?е?"
+msgstr "Ð?Ñ?еÑ?зимаÑ?е Ñ? Ñ?окÑ?. Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е задаÑ?ак?"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "УÑ?еÑ?иваÑ? ниÑ?е могао биÑ?и Ñ?Ñ?иÑ?ан."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Ð?озивниÑ?е е-поÑ?Ñ?ом биÑ?е поÑ?лаÑ?е Ñ?вим Ñ?Ñ?еÑ?ниÑ?има да би могли да пÑ?иÑ?ваÑ?е ово "
-"задÑ?жеÑ?е."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Ð?озивниÑ?е е-поÑ?Ñ?ом биÑ?е поÑ?лаÑ?е Ñ?вим Ñ?Ñ?еÑ?ниÑ?има да би могли да пÑ?иÑ?ваÑ?е оваÑ? задаÑ?ак."
 
 # bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Ð?озивниÑ?е Ñ?е биÑ?и поÑ?лаÑ?е е-поÑ?Ñ?ом Ñ?вим Ñ?Ñ?еÑ?ниÑ?има и омогÑ?Ñ?иÑ?е им да "
-"одговоÑ?е."
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Ð?озивниÑ?е Ñ?е биÑ?и поÑ?лаÑ?е е-поÑ?Ñ?ом Ñ?вим Ñ?Ñ?еÑ?ниÑ?има и омогÑ?Ñ?иÑ?е им да одговоÑ?е."
 
 #: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
@@ -4392,7 +2931,7 @@ msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?иÑ?аваÑ?Ñ? Ñ?пиÑ?ка белеÑ?ки"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
-msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?иÑ?аваÑ?Ñ? Ñ?пиÑ?ка задÑ?жеÑ?а"
+msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?иÑ?аваÑ?Ñ? Ñ?пиÑ?ка задаÑ?ака"
 
 #. For Translators: {0} is specify the backend server
 #: ../calendar/calendar.error.xml.h:44
@@ -4400,36 +2939,24 @@ msgid "Error on '{0}'"
 msgstr "Ð?Ñ?еÑ?ка на â??{0}â??"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е "
-"знаÑ?и да Ñ?е Ñ?аÑ?Ñ?анак оÑ?казан."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е знаÑ?и да Ñ?е Ñ?аÑ?Ñ?анак оÑ?казан."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е "
-"знаÑ?и да Ñ?е белеÑ?ка обÑ?иÑ?ана."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е знаÑ?и да Ñ?е белеÑ?ка обÑ?иÑ?ана."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е "
-"знаÑ?и да Ñ?е задÑ?жеÑ?е обÑ?иÑ?ано."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgstr "Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е знаÑ?и да Ñ?е задаÑ?ак обÑ?иÑ?ан."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "No response from the server."
-msgstr ""
+msgstr "Ð?ема одговоÑ?а Ñ?еÑ?веÑ?а."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "Save Appointment"
-msgstr "СаÑ?Ñ?ваÑ? заказани Ñ?аÑ?Ñ?анак"
+msgstr "СаÑ?Ñ?ваÑ? заказиваÑ?е"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "Save Memo"
@@ -4437,43 +2964,27 @@ msgstr "СаÑ?Ñ?ва белеÑ?кÑ?"
 
 #: ../calendar/calendar.error.xml.h:51
 msgid "Save Task"
-msgstr "СаÑ?Ñ?ваÑ? задÑ?жеÑ?е"
+msgstr "СаÑ?Ñ?ваÑ? задаÑ?ак"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"СлаÑ?е оÑ?вежениÑ? подаÑ?ака омогÑ?Ñ?ава оÑ?Ñ?алим Ñ?Ñ?еÑ?ниÑ?има да Ñ?иÑ?ов календаÑ? бÑ?де "
-"Ñ? Ñ?окÑ?."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "СлаÑ?е оÑ?вежениÑ? подаÑ?ака омогÑ?Ñ?ава оÑ?Ñ?алим Ñ?Ñ?еÑ?ниÑ?има да Ñ?иÑ?ов календаÑ? бÑ?де Ñ? Ñ?окÑ?."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"СлаÑ?е оÑ?вежениÑ? подаÑ?ака омогÑ?Ñ?ава оÑ?Ñ?алим Ñ?Ñ?еÑ?ниÑ?има да Ñ?иÑ?ов Ñ?пиÑ?ак "
-"задÑ?жеÑ?а бÑ?де Ñ? Ñ?окÑ?."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "СлаÑ?е оÑ?вежениÑ? подаÑ?ака омогÑ?Ñ?ава оÑ?Ñ?алим Ñ?Ñ?еÑ?ниÑ?има да Ñ?иÑ?ов Ñ?пиÑ?ак задаÑ?ака бÑ?де Ñ? Ñ?окÑ?."
 
 #: ../calendar/calendar.error.xml.h:55
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Ð?Ñ?еÑ?зима Ñ?е неколико пÑ?илога. Уколико Ñ?ада Ñ?аÑ?Ñ?ваÑ?е заказани Ñ?аÑ?Ñ?анак ови "
-"пÑ?илози неÑ?е биÑ?и Ñ?аÑ?Ñ?вани Ñ?а Ñ?им."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "Ð?Ñ?еÑ?зима Ñ?е неколико пÑ?илога. Уколико Ñ?ада Ñ?аÑ?Ñ?ваÑ?е заказиваÑ?е ови пÑ?илози неÑ?е биÑ?и Ñ?аÑ?Ñ?вани Ñ?а Ñ?им."
 
 #: ../calendar/calendar.error.xml.h:56
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Ð?Ñ?еÑ?зимаÑ?е неколико пÑ?илога Ñ?е Ñ? Ñ?окÑ?. Уколико Ñ?ада Ñ?аÑ?Ñ?ваÑ?е задÑ?жеÑ?е ови "
-"пÑ?илози неÑ?е биÑ?и Ñ?аÑ?Ñ?вани Ñ?а Ñ?им."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Ð?Ñ?еÑ?зимаÑ?е неколико пÑ?илога Ñ?е Ñ? Ñ?окÑ?. Уколико Ñ?ада Ñ?аÑ?Ñ?ваÑ?е задаÑ?ак ови пÑ?илози неÑ?е биÑ?и Ñ?аÑ?Ñ?вани Ñ?а Ñ?им."
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
-msgstr "Ð?а Ñ?екÑ?Ñ?оÑ? веÑ?зиÑ?и Ñ?еÑ?веÑ?а неке могÑ?Ñ?ноÑ?Ñ?и можда неÑ?е иÑ?пÑ?авно Ñ?адиÑ?и"
+msgstr "Ð?а Ñ?екÑ?Ñ?оÑ? веÑ?зиÑ?и Ñ?еÑ?веÑ?а неке могÑ?Ñ?ноÑ?Ñ?и можда неÑ?е иÑ?пÑ?авно Ñ?адиÑ?и."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4489,7 +3000,7 @@ msgstr "Ð?алендаÑ? Ð?волÑ?Ñ?иÑ?е Ñ?е неоÑ?екивано завÑ?
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Ð?волÑ?Ñ?иÑ?а задÑ?жеÑ?а Ñ?Ñ? неоÑ?екивано завÑ?Ñ?ила."
+msgstr "Ð?адаÑ?и Ð?волÑ?Ñ?иÑ?е Ñ?Ñ? неоÑ?екивано завÑ?Ñ?или."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
@@ -4501,7 +3012,7 @@ msgstr "СпиÑ?ак белеÑ?ки ниÑ?е ознаÑ?ен за коÑ?иÑ?Ñ?е
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
-msgstr "СпиÑ?ак задÑ?жеÑ?а ниÑ?е ознаÑ?ен за коÑ?иÑ?Ñ?еÑ?е ван мÑ?еже."
+msgstr "СпиÑ?ак задаÑ?ака ниÑ?е ознаÑ?ен за коÑ?иÑ?Ñ?еÑ?е ван мÑ?еже."
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
@@ -4513,7 +3024,7 @@ msgstr "Ð?ваÑ? Ñ?пиÑ?ак белеÑ?ки Ñ?е биÑ?и Ñ?Ñ?аÑ?но Ñ?кло
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
-msgstr "Ð?ваÑ? Ñ?пиÑ?ак задÑ?жеÑ?а Ñ?е биÑ?и Ñ?Ñ?аÑ?но Ñ?клоÑ?ен."
+msgstr "Ð?ваÑ? Ñ?пиÑ?ак задаÑ?ака Ñ?е биÑ?и Ñ?Ñ?аÑ?но Ñ?клоÑ?ен."
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Unable to load the calendar"
@@ -4521,19 +3032,19 @@ msgstr "Ð?е могÑ? да оÑ?воÑ?им календаÑ?"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
-msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене на заказаном Ñ?аÑ?Ñ?анкÑ??"
+msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене Ñ? заказиваÑ?Ñ??"
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
-msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене Ñ? овим белеÑ?кама?"
+msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене на овоÑ? белеÑ?Ñ?и?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
-msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене на задÑ?жеÑ?Ñ??"
+msgstr "Ð?елиÑ?е ли да Ñ?аÑ?Ñ?ваÑ?е пÑ?омене на овом задаÑ?кÑ??"
 
 #: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ? за оваÑ? белеÑ?кÑ??"
+msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ? за овÑ? белеÑ?кÑ??"
 
 # calendar:prompt-cancel-task primary
 #: ../calendar/calendar.error.xml.h:73
@@ -4546,7 +3057,7 @@ msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е позиве на Ñ?аÑ?Ñ?ана
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
-msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е ово задÑ?жеÑ?е Ñ?Ñ?еÑ?ниÑ?има?"
+msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е оваÑ? задаÑ?ак Ñ?Ñ?еÑ?ниÑ?има?"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
@@ -4554,24 +3065,19 @@ msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е оÑ?вежене подаÑ?ке
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
-msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е оÑ?вежене подаÑ?ке о задÑ?жеÑ?Ñ? Ñ?Ñ?еÑ?ниÑ?има?"
+msgstr "Ð?елиÑ?е ли да поÑ?аÑ?еÑ?е оÑ?вежене подаÑ?ке о задаÑ?кÑ? Ñ?Ñ?еÑ?ниÑ?има?"
 
 #: ../calendar/calendar.error.xml.h:78
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"Ð?овезÑ?Ñ?еÑ?е Ñ?е на неподÑ?жан GroupWise Ñ?еÑ?веÑ? Ñ?Ñ?о може да доведе до пÑ?облема Ñ? "
-"Ñ?адÑ? Ð?волÑ?Ñ?иÑ?е. Ð?аÑ?боÑ?е Ñ?е да Ñ?еÑ?веÑ? бÑ?де надогÑ?аÑ?ен на подÑ?жанÑ? веÑ?зиÑ?Ñ?."
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgstr "Ð?овезÑ?Ñ?еÑ?е Ñ?е на неподÑ?жан GroupWise Ñ?еÑ?веÑ? Ñ?Ñ?о може да доведе до пÑ?облема Ñ? Ñ?адÑ? Ð?волÑ?Ñ?иÑ?е. Ð?аÑ?боÑ?е Ñ?е да Ñ?еÑ?веÑ? бÑ?де надогÑ?аÑ?ен на подÑ?жанÑ? веÑ?зиÑ?Ñ?."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "Ð?Ñ?оменили Ñ?Ñ?е оваÑ? заказани Ñ?аÑ?Ñ?анак, али пÑ?омене Ñ?оÑ? ниÑ?Ñ?е Ñ?аÑ?Ñ?вали."
+msgstr "Ð?Ñ?оменили Ñ?Ñ?е оваÑ? заказиваÑ?е, али пÑ?омене Ñ?оÑ? ниÑ?Ñ?е Ñ?аÑ?Ñ?вали."
 
 #: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
-msgstr "Ð?Ñ?оменили Ñ?Ñ?е ово задÑ?жеÑ?е, али пÑ?омене Ñ?оÑ? ниÑ?Ñ?е Ñ?аÑ?Ñ?вали."
+msgstr "Ð?Ñ?оменили Ñ?Ñ?е оваÑ? задаÑ?ак, али пÑ?омене Ñ?оÑ? ниÑ?Ñ?е Ñ?аÑ?Ñ?вали."
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
@@ -4587,14 +3093,15 @@ msgstr "Ð?елеÑ?ка неÑ?е биÑ?и доÑ?Ñ?Ñ?пна док Ñ?е Ð?волÑ?
 
 #: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Ð?адÑ?жеÑ?а неÑ?е биÑ?и доÑ?Ñ?Ñ?пна док Ñ?е Ð?волÑ?Ñ?иÑ?а поново не покÑ?ене."
+msgstr "Ð?адаÑ?и неÑ?е биÑ?и доÑ?Ñ?Ñ?пни док Ñ?е Ð?волÑ?Ñ?иÑ?а поново не покÑ?ене."
 
 #: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Ð?анемаÑ?и пÑ?омене"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_СаÑ?Ñ?ваÑ?"
 
@@ -4603,7 +3110,8 @@ msgid "_Save Changes"
 msgstr "СаÑ?Ñ?ваÑ? пÑ?о_мене"
 
 #: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Ð?оÑ?аÑ?и"
@@ -4616,66 +3124,66 @@ msgstr "Ð?оÑ?аÑ?и по_дÑ?еÑ?ник"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Ð?одели виÑ?едневне догаÑ?аÑ?е:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Ð?еÑ?Ñ?пело покÑ?еÑ?аÑ?е еволÑ?Ñ?иÑ?а-Ñ?еÑ?веÑ?а-подаÑ?ака"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е пÑ?огÑ?амÑ?ког блока пилоÑ?овог Ð?алендаÑ?а"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е пилоÑ?овог блока белеÑ?ки"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Ð?еÑ?Ñ?пео Ñ?пиÑ? пилоÑ?овог блока белеÑ?ки"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Ð?одÑ?азÑ?мевана важноÑ?Ñ?:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е пилоÑ?овог ToDo пÑ?огÑ?амÑ?ког блока"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "Ð?еÑ?Ñ?пео Ñ?пиÑ? Ñ? пилоÑ?ов блок â??Ñ?Ñ?адиÑ?иâ??"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
-msgstr "Ð?алендаÑ? и задÑ?жеÑ?а"
+msgstr "Ð?алендаÑ? и задаÑ?и"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Ð?алендаÑ?и"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ð?одеÑ?иÑ?е вÑ?еменÑ?кÑ? зонÑ?, календаÑ? и лиÑ?Ñ?Ñ? задÑ?жеÑ?а овде "
+msgstr "Ð?одеÑ?иÑ?е вÑ?еменÑ?кÑ? зонÑ?, календаÑ? и Ñ?пиÑ?ак задаÑ?ака овде "
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
-msgstr "Ð?волÑ?Ñ?иÑ?а календаÑ? и задÑ?жеÑ?а"
+msgstr "Ð?волÑ?Ñ?иÑ?а календаÑ? и задаÑ?и"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
@@ -4687,46 +3195,53 @@ msgstr "Ð?Ñ?егледаÑ? заказаниÑ? поÑ?Ñ?ка Ð?волÑ?Ñ?иÑ?а к
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
-msgstr "УÑ?еÑ?иваÑ? Ð?волÑ?Ñ?иÑ?а календаÑ?а/задÑ?жеÑ?а"
+msgstr "УÑ?еÑ?иваÑ? Ð?волÑ?Ñ?иÑ?а календаÑ?а/задаÑ?ака"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
-msgstr "Ð?ео Ð?волÑ?Ñ?иÑ?е â?? Ð?алендаÑ?"
+msgstr "Ð?ео календаÑ?а Ð?волÑ?Ñ?иÑ?е"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr "Ð?ео Ð?волÑ?Ñ?иÑ?е â?? Ð?елеÑ?ке"
+msgstr "Ð?ео белеÑ?ки Ð?волÑ?Ñ?иÑ?е"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
-msgstr "Ð?ео Ð?волÑ?Ñ?иÑ?е â?? Ð?адÑ?жеÑ?а"
+msgstr "Ð?ео задаÑ?ака Ð?волÑ?Ñ?иÑ?е"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "Ð?е_леÑ?ке"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:389
-#: ../calendar/gui/memos-control.c:405
+#: ../calendar/gui/e-memo-table.c:293
+#: ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846
+#: ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Ð?елеÑ?ке"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
+#: ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714
+#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557
+#: ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524
+#: ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
-msgstr "Ð?адÑ?жеÑ?а"
+msgstr "Ð?адаÑ?и"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
@@ -4734,58 +3249,59 @@ msgstr "_Ð?алендаÑ?и"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
-msgstr "_Ð?адÑ?жеÑ?а"
+msgstr "_Ð?адаÑ?и"
 
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
-msgstr "СеÑ?виÑ? за Ñ?позоÑ?еÑ?а Ð?волÑ?Ñ?иÑ?а календаÑ?а"
+msgstr "СеÑ?виÑ? за алаÑ?ме календаÑ?а Ð?волÑ?Ñ?иÑ?е"
 
 # bug: plural-forms
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минÑ?Ñ?"
 msgstr[1] "минÑ?Ñ?а"
 msgstr[2] "минÑ?Ñ?а"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "Ñ?аÑ?"
 msgstr[1] "Ñ?аÑ?а"
 msgstr[2] "Ñ?аÑ?и"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Ð?Ñ?еме поÑ?еÑ?ка"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
-msgstr "Ð?аказани Ñ?аÑ?Ñ?анÑ?и"
+msgstr "Ð?аказиваÑ?а"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Dismiss _All"
-msgstr ""
+msgstr "Ð?анемаÑ?и _Ñ?ве"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
-msgstr "Ð?еÑ?Ñ?о:"
+msgstr "Ð?окаÑ?иÑ?а:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "Snooze _time:"
@@ -4793,17 +3309,21 @@ msgstr "Ð?Ñ?еме _дÑ?емаÑ?а:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Dismiss"
-msgstr ""
+msgstr "_Ð?анемаÑ?и"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../ui/evolution-addressbook.xml.h:51
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_УÑ?еÑ?иваÑ?е"
@@ -4814,35 +3334,35 @@ msgstr "Ð?Ñ?е_маÑ?е"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "location of appointment"
-msgstr "заказано меÑ?Ñ?о Ñ?аÑ?Ñ?анка"
+msgstr "заказана локаÑ?иÑ?а"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
-msgstr "Ð?ема доÑ?Ñ?Ñ?пног пÑ?егледа."
+msgstr "Ð?ема доÑ?Ñ?Ñ?пног Ñ?ажеÑ?ка."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "Ð?ема доÑ?Ñ?Ñ?пног опиÑ?а."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
-msgstr "Ð?ема доÑ?Ñ?Ñ?пног подаÑ?ка о меÑ?Ñ?Ñ?."
+msgstr "Ð?ема доÑ?Ñ?Ñ?пног подаÑ?ка о локаÑ?иÑ?и."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "Ð?Ñ?оÑ? поÑ?Ñ?авÑ?ениÑ? алаÑ?ма: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "УпозоÑ?еÑ?е"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4854,24 +3374,22 @@ msgstr ""
 "подÑ?еÑ?ник подеÑ?ен да поÑ?аÑ?е поÑ?Ñ?кÑ?. Ð?волÑ?Ñ?иÑ?а Ñ?е\n"
 "Ñ?меÑ?Ñ?о Ñ?ога пÑ?иказаÑ?и ноÑ?мално пÑ?озоÑ?Ñ?е."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Ð?одÑ?еÑ?ник Ð?волÑ?Ñ?иÑ?а календаÑ?а Ñ?е биÑ?и покÑ?енÑ?Ñ?. Ð?ваÑ? подÑ?еÑ?ник Ñ?е подеÑ?ен да "
-"покÑ?ене Ñ?ледеÑ?и пÑ?огÑ?ам:\n"
+"Ð?одÑ?еÑ?ник Ð?волÑ?Ñ?иÑ?а календаÑ?а Ñ?е биÑ?и покÑ?енÑ?Ñ?. Ð?ваÑ? подÑ?еÑ?ник Ñ?е подеÑ?ен да покÑ?ене Ñ?ледеÑ?и пÑ?огÑ?ам:\n"
 "\n"
 "        %s\n"
 "\n"
 "СигÑ?Ñ?но желиÑ?е да покÑ?енеÑ?е оваÑ? пÑ?огÑ?ам?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ð?е пиÑ?аÑ? ме поново за оваÑ? пÑ?огÑ?ам."
 
@@ -4880,9 +3398,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Ð?иÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и Ð?онобо"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "Ð?иÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и Ñ?еÑ?виÑ? за Ñ?позоÑ?еÑ?а, можда Ñ?е веÑ? акÑ?иван..."
 
 #: ../calendar/gui/alarm-notify/util.c:44
@@ -4890,7 +3406,8 @@ msgid "invalid time"
 msgstr "неиÑ?пÑ?авно вÑ?еме"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4900,7 +3417,8 @@ msgstr[1] "%d Ñ?аÑ?а"
 msgstr[2] "%d Ñ?аÑ?и"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4912,7 +3430,8 @@ msgstr[2] "%d минÑ?Ñ?а"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -4928,11 +3447,11 @@ msgstr "Ð?Ñ?огÑ?ами за алаÑ?м"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Ð?Ñ?еме Ñ? Ñ?екÑ?ндама за коÑ?е Ñ?е пÑ?иказÑ?Ñ?е гÑ?еÑ?ка Ñ? Ñ?Ñ?аÑ?Ñ?Ñ?ноÑ? линиÑ?и."
+msgstr "Ð?Ñ?еме Ñ? Ñ?екÑ?ндама за коÑ?е Ñ?е пÑ?иказÑ?Ñ?е гÑ?еÑ?ка Ñ? Ñ?Ñ?аÑ?Ñ?Ñ?ноÑ? Ñ?Ñ?аÑ?и."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
-msgstr "ТÑ?ажи поÑ?вÑ?дÑ? за бÑ?иÑ?аÑ?е пÑ?едмеÑ?а"
+msgstr "ТÑ?ажи поÑ?вÑ?дÑ? за бÑ?иÑ?аÑ?е Ñ?Ñ?авки"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
@@ -4947,659 +3466,642 @@ msgid "Calendars to run alarms for"
 msgstr "Ð?алендаÑ?и за коÑ?е Ñ?е покÑ?еÑ?е алаÑ?м"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Ð?оÑ?а за иÑ?Ñ?Ñ?Ñ?аваÑ?е Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е Ñ? линиÑ?и вÑ?емена (подÑ?азÑ?мевано Ñ?е "
-"пÑ?азно)."
+msgid "Check this to use system timezone in Evolution."
+msgstr "Ð?знаÑ?иÑ?е ово да би Ð?волÑ?Ñ?иÑ?а коÑ?иÑ?Ñ?ила вÑ?еменÑ?кÑ? зонÑ? Ñ?иÑ?Ñ?ема."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Ð?оÑ?а за иÑ?Ñ?Ñ?Ñ?аваÑ?е Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е Ñ? дневном пÑ?егледÑ?."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Ð?оÑ?а за иÑ?Ñ?Ñ?Ñ?аваÑ?е Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е Ñ? Ñ?Ñ?аÑ?и вÑ?емена (подÑ?азÑ?мевано Ñ?е пÑ?азно)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Ð?оÑ?а за иÑ?Ñ?Ñ?Ñ?аваÑ?е Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е Ñ? Ð?невном пÑ?егледÑ?."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Сажми викенде Ñ? меÑ?еÑ?ни пÑ?еглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Ð?оÑ?вÑ?ди пÑ?ажÑ?еÑ?е"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "Ð?Ñ?оÑ? подÑ?азÑ?меваниÑ? понавÑ?аÑ?а новог догаÑ?аÑ?а. -1 знаÑ?и заÑ?век."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Ð?оÑ?Ñ?ебно Ñ?е ознаÑ?иÑ?и дане коÑ?има поÑ?иÑ?Ñ? и завÑ?Ñ?аваÑ?Ñ? Ñ?е Ñ?адни Ñ?аÑ?ови."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
-msgstr "Ð?одÑ?азÑ?мевани подÑ?еÑ?ник за Ñ?аÑ?Ñ?анак"
+msgstr "Ð?одÑ?азÑ?мевани подÑ?еÑ?ник за заказиваÑ?е"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#| msgid "Default reminder units"
+msgid "Default recurrence count"
+msgstr "Ð?одÑ?азÑ?меван бÑ?оÑ? понавÑ?аÑ?а"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Ð?одÑ?азÑ?меване Ñ?единиÑ?е подÑ?еÑ?ника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Ð?одÑ?азÑ?мевана вÑ?едноÑ?Ñ? подÑ?еÑ?ника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за Ñ?Ñ?ваÑ?е звÑ?Ñ?ниÑ? даÑ?оÑ?ека алаÑ?ма"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "СÑ?епен догаÑ?аÑ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Ð?Ñ?овидноÑ?Ñ? догаÑ?аÑ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "Ð?дÑ?еÑ?е Ñ?еÑ?веÑ?а за Ñ?лободно/заÑ?зеÑ?о вÑ?еме"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Ð?одел адÑ?еÑ?а за Ñ?лободно/заÑ?зеÑ?о вÑ?еме"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "СÑ?епен догаÑ?аÑ?а Ñ? пÑ?егледÑ? календаÑ?а."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
-msgstr "СакÑ?иÑ? завÑ?Ñ?ена задÑ?жеÑ?а"
+msgstr "СакÑ?иÑ? завÑ?Ñ?ене задаÑ?ке"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
-msgstr "СакÑ?иÑ? Ñ?единиÑ?е задÑ?жеÑ?а"
+msgstr "СакÑ?иÑ? Ñ?единиÑ?е задаÑ?ака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
-msgstr "СакÑ?иÑ? вÑ?едноÑ?Ñ? задÑ?жеÑ?а"
+msgstr "СакÑ?иÑ? вÑ?едноÑ?Ñ? задаÑ?ака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Ð?озиÑ?иÑ?а положене повÑ?Ñ?и"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"СаÑ? коÑ?им Ñ?е завÑ?Ñ?ава Ñ?адна недеÑ?а, Ñ? двадеÑ?еÑ?Ñ?еÑ?воÑ?оÑ?аÑ?овном обликÑ?, од 0 "
-"до 23."
+msgstr "СаÑ? коÑ?им Ñ?е завÑ?Ñ?ава Ñ?адна недеÑ?а, Ñ? двадеÑ?еÑ?Ñ?еÑ?воÑ?оÑ?аÑ?овном обликÑ?, од 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-"СаÑ? коÑ?им поÑ?иÑ?е Ñ?адна недеÑ?а, Ñ? двадеÑ?еÑ?Ñ?еÑ?воÑ?оÑ?аÑ?овном обликÑ?, од 0 до 23."
+msgstr "СаÑ? коÑ?им поÑ?иÑ?е Ñ?адна недеÑ?а, Ñ? двадеÑ?еÑ?Ñ?еÑ?воÑ?оÑ?аÑ?овном обликÑ?, од 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Ð?нÑ?еÑ?вали пÑ?иказани Ñ? дневним и недеÑ?ним пÑ?егледима, Ñ? минÑ?Ñ?има."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Ð?оÑ?ледÑ?е вÑ?еме за алаÑ?м"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "Ð?иво након коÑ?ег Ñ?е поÑ?Ñ?ка заводи Ñ? дневник."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
-msgstr ""
+msgstr "СпиÑ?ак недавно коÑ?иÑ?Ñ?ениÑ? дÑ?Ñ?гиÑ? вÑ?еменÑ?киÑ? зона Ñ? Ð?невном пÑ?егледÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "СпиÑ?ак адÑ?еÑ?а Ñ?еÑ?веÑ?а за обÑ?авÑ?иваÑ?е Ñ?лободног/заÑ?зеÑ?ог вÑ?емена."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Ð?оÑ?а Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е - дневни пÑ?еглед"
+msgstr "Ð?оÑ?а Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е - Ð?невни пÑ?еглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Ð?оÑ?а Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е - линиÑ?а вÑ?емена"
+msgstr "Ð?оÑ?а Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?е - Ñ?Ñ?ака вÑ?емена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgstr "Ð?аÑ?веÑ?и бÑ?оÑ? недавно коÑ?иÑ?Ñ?ениÑ? вÑ?еменÑ?киÑ? зона за памÑ?еÑ?е Ñ? Ñ?пиÑ?кÑ? â??day_second_zonesâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
-msgstr ""
+msgstr "Ð?аÑ?веÑ?и бÑ?оÑ? недавно коÑ?иÑ?Ñ?ениÑ? вÑ?еменÑ?киÑ? зона за памÑ?еÑ?е."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Ð?инÑ?Ñ? коÑ?им Ñ?е завÑ?Ñ?ава Ñ?адни дан, од 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Ð?инÑ?Ñ? коÑ?им поÑ?иÑ?е Ñ?адни дан, од 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
-msgstr "Ð?озиÑ?иÑ?а положене повÑ?Ñ?и меÑ?еÑ?ног пÑ?егледа"
+msgstr "Ð?озиÑ?иÑ?а положене повÑ?Ñ?и Ð?еÑ?еÑ?ног пÑ?егледа"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
-msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и меÑ?еÑ?ног пÑ?егледа"
+msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и Ð?еÑ?еÑ?ног пÑ?егледа"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "Ð?Ñ?оÑ? Ñ?единиÑ?а за одÑ?еÑ?иваÑ?е подÑ?азÑ?меваног подÑ?еÑ?ника."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Number of units for determining when to hide tasks."
-msgstr "Ð?Ñ?оÑ? Ñ?единиÑ?а за одÑ?еÑ?иваÑ?е када Ñ?акÑ?иÑ?и задÑ?жеÑ?а."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Overdue tasks color"
-msgstr "Ð?оÑ?а пÑ?екоÑ?аÑ?ениÑ? задÑ?жеÑ?а"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-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:45
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Ð?озиÑ?иÑ?а положене повÑ?Ñ?и, измеÑ?Ñ? пÑ?егледа и дела календаÑ?а за даÑ?Ñ?м и лиÑ?Ñ?е "
-"задÑ?жеÑ?а Ñ? меÑ?еÑ?ном пÑ?егледÑ?, Ñ? пикÑ?елима."
+msgid "Number of units for determining when to hide tasks."
+msgstr "Ð?Ñ?оÑ? Ñ?единиÑ?а за одÑ?еÑ?иваÑ?е када Ñ?акÑ?иÑ?и задаÑ?ке."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Ð?оложаÑ? Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? лиÑ?Ñ?е календаÑ?а и навигаÑ?иÑ?е календаÑ?а по "
-"даÑ?Ñ?мÑ?."
+msgid "Overdue tasks color"
+msgstr "Ð?оÑ?а пÑ?екоÑ?аÑ?ениÑ? задаÑ?ака"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? лиÑ?Ñ?е задÑ?жеÑ?а и панела за пÑ?еглед "
-"задÑ?жеÑ?а, Ñ? пикÑ?елима."
+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:48
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? пÑ?егледа и дела календа за даÑ?Ñ?м и лиÑ?Ñ?е "
-"задÑ?жеÑ?а Ñ? меÑ?еÑ?ном пÑ?егледÑ?, Ñ? пикÑ?елима."
+msgid "Position of the 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:49
-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 ""
-"Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? пÑ?егледа и дела календаÑ?а за даÑ?Ñ?м и лиÑ?Ñ?е "
-"задÑ?жеÑ?а када ниÑ?е поÑ?Ñ?авÑ?ен меÑ?еÑ?ни пÑ?еглед, Ñ? пикÑ?елима."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+msgstr "Ð?оложаÑ? Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? лиÑ?Ñ?е календаÑ?а и навигаÑ?иÑ?е календаÑ?а по даÑ?Ñ?мÑ?."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? Ñ?пиÑ?ка задаÑ?ака и панела за пÑ?еглед задаÑ?ака, Ñ? пикÑ?елима."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? пÑ?егледа и дела календаÑ?а за даÑ?Ñ?м и Ñ?пиÑ?ка задаÑ?ака Ñ? меÑ?еÑ?ном пÑ?егледÑ?, Ñ? пикÑ?елима."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и, измеÑ?Ñ? пÑ?егледа и дела календаÑ?а за даÑ?Ñ?м и Ñ?пиÑ?ка задаÑ?ака када ниÑ?е поÑ?Ñ?авÑ?ен меÑ?еÑ?ни пÑ?еглед, Ñ? пикÑ?елима."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#| msgid "Print this calendar"
+msgid "Primary calendar"
+msgstr "Ð?Ñ?имаÑ?ни календаÑ?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#| msgid "New memo list"
+msgid "Primary memo list"
+msgstr "Ð?Ñ?имаÑ?ни Ñ?пиÑ?ак белеÑ?ки"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#| msgid "New task list"
+msgid "Primary task list"
+msgstr "Ð?Ñ?имаÑ?ни Ñ?пиÑ?ак задаÑ?ака"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Ð?Ñ?огÑ?ами коÑ?и могÑ? биÑ?и покÑ?енÑ?Ñ?и алаÑ?мима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
-msgstr ""
+msgstr "Ð?едавно коÑ?иÑ?Ñ?ене дÑ?Ñ?ге вÑ?еменÑ?ке зоне Ñ? Ð?невном пÑ?егледÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за Ñ?Ñ?ваÑ?е звÑ?Ñ?ниÑ? алаÑ?ма"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "Ð?еÑ?еÑ?ни пÑ?еглед по недеÑ?ама"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Ð?Ñ?икажи RSVP поÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а"
+msgstr "Ð?Ñ?икажи RSVP поÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "Ð?Ñ?икажи поÑ?е Ñ?логе Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а"
+msgstr "Ð?Ñ?икажи поÑ?е Ñ?логе Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
-msgstr "Ð?Ñ?иказÑ?Ñ?е вÑ?емена завÑ?Ñ?еÑ?ка Ñ?аÑ?Ñ?анака Ñ? недеÑ?ним и меÑ?еÑ?ним пÑ?егледима"
+msgstr "Ð?Ñ?иказÑ?Ñ?е вÑ?емена заказаног завÑ?Ñ?еÑ?ка Ñ? недеÑ?ним и меÑ?еÑ?ним пÑ?егледима"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "Ð?Ñ?икажи поÑ?е каÑ?егоÑ?иÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а/задÑ?жеÑ?а"
+msgstr "Ð?Ñ?икажи поÑ?е каÑ?егоÑ?иÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/Ñ?аÑ?Ñ?анака/задаÑ?ака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "Ð?Ñ?иказÑ?Ñ?е алаÑ?ме Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Ð?Ñ?икажи поÑ?е â??СÑ?аÑ?еâ?? Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а"
+msgstr "Ð?Ñ?икажи поÑ?е Ñ?Ñ?аÑ?а Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Ð?Ñ?икажи повÑ?Ñ? â??Ð?Ñ?егледâ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Ð?Ñ?иказÑ?Ñ?е повÑ?Ñ? â??Ð?Ñ?егледâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Ð?Ñ?икажи поÑ?е вÑ?еменÑ?ке зоне Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а (Ñ?Ñ?Ñ?Ñ?еÑ?а)"
+msgstr "Ð?Ñ?икажи поÑ?е вÑ?еменÑ?ке зоне Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Ð?Ñ?икажи поÑ?е â??Ð?Ñ?Ñ?Ñ?аâ?? Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а"
+msgstr "Ð?Ñ?икажи поÑ?е Ñ?ипа Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
-msgstr "Ð?Ñ?иказÑ?Ñ?е бÑ?оÑ?еве недеÑ?а Ñ? делÑ? за даÑ?Ñ?м"
+msgstr "Ð?Ñ?иказÑ?Ñ?е бÑ?оÑ? недеÑ?е Ñ? дневном и пÑ?егледÑ? за Ñ?аднÑ? недеÑ?Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "Ð?Ñ?иказÑ?Ñ?е бÑ?оÑ?еве недеÑ?а Ñ? делÑ? за даÑ?Ñ?м"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr "Ð?Ñ?иказÑ?Ñ?е дÑ?Ñ?гÑ? вÑ?еменÑ?кÑ? зонÑ? Ñ? Ð?невном пÑ?егледÑ?, Ñ?колико Ñ?е подеÑ?ена. Ð?Ñ?едноÑ?Ñ? Ñ?е Ñ?лиÑ?на оноÑ? коÑ?а Ñ?е коÑ?иÑ?Ñ?ена Ñ? кÑ?Ñ?Ñ?Ñ? â??timezoneâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
-msgstr "Ð?оÑ?а задÑ?жеÑ?а за данаÑ?"
+msgstr "Ð?оÑ?а задаÑ?ка за данаÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
-msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и задÑ?жеÑ?а"
+msgstr "Ð?озиÑ?иÑ?а Ñ?Ñ?пÑ?авне повÑ?Ñ?и задаÑ?ка"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Ð?одел адÑ?еÑ?е за коÑ?иÑ?Ñ?еÑ?е Ñ? повÑ?аÑ?аÑ?Ñ? вÑ?емена Ñ?лободно/заÑ?зеÑ?о, %u Ñ?е "
-"замеÑ?Ñ?Ñ?е коÑ?иÑ?ниÑ?ким делом елекÑ?Ñ?онÑ?ке адÑ?еÑ?е, а %d доменом."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "Ð?одел адÑ?еÑ?е за коÑ?иÑ?Ñ?еÑ?е Ñ? повÑ?аÑ?аÑ?Ñ? вÑ?емена Ñ?лободно/заÑ?зеÑ?о, %u Ñ?е замеÑ?Ñ?Ñ?е коÑ?иÑ?ниÑ?ким делом елекÑ?Ñ?онÑ?ке адÑ?еÑ?е, а %d доменом."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"Ð?одÑ?азÑ?мевана вÑ?еменÑ?ка зона коÑ?Ñ? календаÑ? коÑ?иÑ?Ñ?и за даÑ?Ñ?м и вÑ?еме, као "
-"непÑ?еведено меÑ?Ñ?о базе вÑ?еменÑ?ке зоне Ð?лÑ?ен, као â??Ð?меÑ?ика/Ð?Ñ?Ñ?оÑ?кâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "Ð?одÑ?азÑ?мевана вÑ?еменÑ?ка зона коÑ?Ñ? календаÑ? коÑ?иÑ?Ñ?и за даÑ?Ñ?м и вÑ?еме, као непÑ?еведено меÑ?Ñ?о базе вÑ?еменÑ?ке зоне Ð?лÑ?ен, као â??Ð?меÑ?ика/Ð?Ñ?Ñ?оÑ?кâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?га вÑ?еменÑ?ка зона Ñ? Ð?невном пÑ?егледÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Ð?оже имаÑ?и Ñ?Ñ?и вÑ?едноÑ?Ñ?и. â??0â?? за гÑ?еÑ?ке. â??1â?? за Ñ?позоÑ?еÑ?а. â??2â?? за поÑ?Ñ?ке о "
-"диÑ?агнози кваÑ?а."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr "Ð?оже имаÑ?и Ñ?Ñ?и вÑ?едноÑ?Ñ?и. 0 за гÑ?еÑ?ке. 1 за Ñ?позоÑ?еÑ?а. 2 за поÑ?Ñ?ке о диÑ?агнози кваÑ?а."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
-msgstr "Ð?одела _вÑ?емена"
+msgstr "Ð?одела вÑ?емена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "Ð?Ñ?еме поÑ?ледÑ?ег покÑ?еÑ?аÑ?а алаÑ?ма, Ñ? time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Ð?Ñ?еменÑ?ка зона"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Ð?Ñ?овидноÑ?Ñ? докаÑ?аÑ?а Ñ? пÑ?егледÑ? календаÑ?а, вÑ?едноÑ?Ñ? измеÑ?Ñ? 0 (пÑ?овидно) и 1 "
-"(непÑ?овидно)"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "Ð?Ñ?овидноÑ?Ñ? докаÑ?аÑ?а Ñ? пÑ?егледÑ? календаÑ?а, вÑ?едноÑ?Ñ? измеÑ?Ñ? 0 (пÑ?овидно) и 1 (непÑ?овидно)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24-Ñ?аÑ?овни облик вÑ?емена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "Ð?дÑ?еÑ?а ознаÑ?еног â??пÑ?имаÑ?ногâ?? календаÑ?а"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "Ð?дÑ?еÑ?а ознаÑ?еног â??пÑ?имаÑ?ногâ?? Ñ?пиÑ?ка белеÑ?ки"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "Ð?дÑ?еÑ?а ознаÑ?еног â??пÑ?имаÑ?ногâ?? Ñ?пиÑ?ка задаÑ?ака"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Ð?единиÑ?е за подÑ?азÑ?мевани подÑ?еÑ?ник, â??minutesâ?? (минÑ?Ñ?и), â??hoursâ?? (Ñ?аÑ?и) или "
-"â??daysâ?? (дани)."
+msgstr "Ð?единиÑ?е за подÑ?азÑ?мевани подÑ?еÑ?ник, â??минÑ?Ñ?иâ??, â??Ñ?аÑ?иâ?? или â??даниâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Ð?единиÑ?е за одÑ?еÑ?иваÑ?е када Ñ?акÑ?иÑ?и задÑ?жеÑ?а, â??minutesâ?? (минÑ?Ñ?и), "
-"â??hoursâ?? (Ñ?аÑ?и) или â??daysâ?? (дани)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Ð?единиÑ?е за одÑ?еÑ?иваÑ?е када Ñ?акÑ?иÑ?и задÑ?жеÑ?а, â??минÑ?Ñ?иâ??, â??Ñ?аÑ?иâ?? или â??даниâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#| msgid "_Use system defaults"
+msgid "Use system timezone"
+msgstr "Ð?оÑ?иÑ?Ñ?и вÑ?еменÑ?кÑ? зонÑ? Ñ?иÑ?Ñ?ема"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Ð?оÑ?иÑ?Ñ?и вÑ?еменÑ?кÑ? зонÑ? Ñ?иÑ?Ñ?ема Ñ?меÑ?Ñ?о оне коÑ?а Ñ?е изабÑ?ана Ñ? Ð?волÑ?Ñ?иÑ?и."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Ð?оÑ?еÑ?ак недеÑ?е"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ð?ан коÑ?им поÑ?иÑ?е недеÑ?а, од недеÑ?е (0) до Ñ?Ñ?боÑ?е (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Ð?а ли да коÑ?иÑ?Ñ?и обавеÑ?Ñ?аÑ?нÑ? зонÑ? за пÑ?иказиваÑ?е алаÑ?ма."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Ð?а ли да Ñ?Ñ?ажи поÑ?вÑ?дÑ? за бÑ?иÑ?аÑ?е Ñ?аÑ?Ñ?анка или задÑ?жеÑ?а."
+msgstr "Ð?а ли да Ñ?Ñ?ажи поÑ?вÑ?дÑ? за бÑ?иÑ?аÑ?е заказиваÑ?а или задаÑ?ка."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Ð?а ли да Ñ?Ñ?ажи поÑ?вÑ?дÑ? пÑ?и избаÑ?иваÑ?Ñ? Ñ?аÑ?Ñ?анка и задÑ?жеÑ?а."
+msgstr "Ð?а ли да Ñ?Ñ?ажи поÑ?вÑ?дÑ? пÑ?и избаÑ?иваÑ?Ñ?заказиваÑ?а или задаÑ?ка."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-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:98
+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:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"Ð?а ли да пÑ?икаже вÑ?емена завÑ?Ñ?еÑ?ка догаÑ?аÑ?а Ñ? недеÑ?ним и меÑ?еÑ?ним пÑ?егледима."
+msgstr "Ð?а ли да пÑ?икаже вÑ?емена завÑ?Ñ?еÑ?ка догаÑ?аÑ?а Ñ? недеÑ?ним и меÑ?еÑ?ним пÑ?егледима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Ð?а ли да Ñ? календаÑ?Ñ? иÑ?Ñ?Ñ?Ñ?а Ð?аÑ?кÑ?Ñ? Ð?еÑ?нÑ? линиÑ?Ñ? (на Ñ?Ñ?енÑ?Ñ?но вÑ?еме)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Ð?а ли да Ñ?акÑ?иÑ?е завÑ?Ñ?ена задÑ?жеÑ?а Ñ? пÑ?егледÑ? задÑ?жеÑ?а."
+msgstr "Ð?а ли да Ñ?акÑ?иÑ?е завÑ?Ñ?ене задаÑ?ке Ñ? пÑ?егледÑ? задаÑ?ака."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "Ð?а ли да пÑ?икаже Ð?еÑ?еÑ?ни пÑ?еглед по недеÑ?ама, Ñ?меÑ?Ñ?о меÑ?еÑ?има."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
-msgstr "Ð?а ли да поÑ?Ñ?ави подÑ?азÑ?мевани подÑ?еÑ?ник за заказане Ñ?аÑ?Ñ?анке."
+msgstr "Ð?а ли да поÑ?Ñ?ави подÑ?азÑ?мевани подÑ?еÑ?ник за заказиваÑ?а."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Ð?а ли да пÑ?икаже RSVP поÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?аÑ?Ñ?анака"
+msgstr "Ð?а ли да пÑ?икаже поÑ?е RSVP Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Ð?а ли да пÑ?икаже поÑ?е каÑ?егоÑ?иÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а (Ñ?аÑ?Ñ?анака)"
+msgstr "Ð?а ли да пÑ?икаже поÑ?е каÑ?егоÑ?иÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Ð?а ли да пÑ?икаже поÑ?е Ñ?а Ñ?логом Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а."
+msgstr "Ð?а ли да пÑ?икаже поÑ?е Ñ?а Ñ?логом Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Ð?а ли да пÑ?икаже поÑ?е Ñ?а Ñ?Ñ?аÑ?ем Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а."
+msgstr "Ð?а ли да пÑ?икаже поÑ?е Ñ?Ñ?аÑ?Ñ?Ñ?а Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Ð?а ли да пÑ?икаже вÑ?еме Ñ? двадеÑ?еÑ?оÑ?аÑ?овном обликÑ? Ñ?меÑ?Ñ?о am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Ð?а ли да пÑ?икаже вÑ?еме Ñ? двадеÑ?еÑ?оÑ?аÑ?овном Ñ?оÑ?маÑ?Ñ?, Ñ?меÑ?Ñ?о am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Ð?а ли да пÑ?икаже поÑ?е вÑ?еменÑ?ке зоне Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а (Ñ?аÑ?Ñ?анака)."
+msgstr "Ð?а ли да пÑ?икаже поÑ?е вÑ?еменÑ?ке зоне Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Ð?а ли да пÑ?икаже поÑ?е вÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задÑ?жеÑ?а/Ñ?Ñ?Ñ?Ñ?еÑ?а."
+msgstr "Ð?а ли да пÑ?икаже поÑ?е Ñ?ипа Ñ? Ñ?Ñ?еÑ?иваÑ?Ñ? догаÑ?аÑ?а/задаÑ?ака/Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
-msgstr "Ð?а ли да пÑ?икаже бÑ?оÑ?еве недеÑ?а Ñ? делÑ? за даÑ?Ñ?м."
+msgstr "Ð?а ли да пÑ?икаже бÑ?оÑ? недеÑ?е Ñ? пÑ?егледима за дан и Ñ?аднÑ? недеÑ?Ñ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Ð?а ли да пÑ?икаже бÑ?оÑ?еве недеÑ?а Ñ? делÑ? за даÑ?Ñ?м."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Ð?али да Ñ?е коÑ?иÑ?Ñ?и леÑ?Ñ?е Ñ?аÑ?Ñ?наÑ?е вÑ?емена када Ñ?е пÑ?иказÑ?Ñ?Ñ? догаÑ?аÑ?и."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Радни дани"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "ЧаÑ? коÑ?им Ñ?е завÑ?Ñ?ава Ñ?адни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Ð?инÑ?Ñ? коÑ?им Ñ?е завÑ?Ñ?ава Ñ?адни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "ЧаÑ? коÑ?им поÑ?иÑ?е Ñ?адни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Ð?инÑ?Ñ? коÑ?им поÑ?иÑ?е Ñ?адни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "Ð?еÑ?Ñ?е Ñ?аÑ?Ñ?наÑ?е вÑ?емена"
+#: ../calendar/gui/cal-editor-utils.c:100
+#| msgid "Invalid contact."
+msgid "Invalid object"
+msgstr "Ð?еиÑ?пÑ?аван обÑ?екаÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
-msgstr "Ð?Ñ?еглед Ñ?адÑ?жи"
+msgstr "СажеÑ?ак Ñ?адÑ?жи"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Ð?пиÑ? Ñ?адÑ?жи"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Ð?аÑ?егоÑ?иÑ?а Ñ?е"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Ð?оменÑ?аÑ? Ñ?адÑ?жи"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
-msgstr "Ð?еÑ?Ñ?о Ñ?адÑ?жи"
+msgstr "Ð?окаÑ?иÑ?а Ñ?адÑ?жи"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
-msgstr "Ð?адÑ?жеÑ?а за Ñ?ледеÑ?Ñ? недеÑ?Ñ?"
+msgstr "Ð?адаÑ?и за Ñ?ледеÑ?Ñ? недеÑ?Ñ?"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
-msgstr "Ð?кÑ?ивна задÑ?жеÑ?а"
+msgstr "Ð?кÑ?ивни задаÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
-msgstr "Ð?Ñ?екоÑ?аÑ?ена задÑ?жеÑ?а"
+msgstr "Ð?Ñ?екоÑ?аÑ?ени задаÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
-msgstr "Ð?авÑ?Ñ?ена задÑ?жеÑ?а"
+msgstr "Ð?авÑ?Ñ?ени задаÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
-msgstr "Ð?адÑ?жеÑ?а Ñ?а пÑ?илозима"
+msgstr "Ð?адаÑ?и Ñ?а пÑ?илозима"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
-msgstr "Ð?кÑ?ивни Ñ?аÑ?Ñ?анÑ?и"
+msgstr "Ð?кÑ?ивна заказиваÑ?а"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
-msgstr "СаÑ?Ñ?анÑ?и Ñ? Ñ?ледеÑ?иÑ? 7 дана"
+msgstr "Ð?аказано за Ñ?ледеÑ?Ñ? недеÑ?Ñ?"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:89
+#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "ШÑ?ампаÑ?"
 
-#: ../calendar/gui/calendar-commands.c:315
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Ð?ва Ñ?адÑ?а Ñ?е Ñ?Ñ?аÑ?но обÑ?иÑ?аÑ?и Ñ?ве догаÑ?аÑ?е пÑ?е изабÑ?аног Ñ?ока. Уколико "
-"наÑ?Ñ?авиÑ?е, неÑ?еÑ?е моÑ?и да повÑ?аÑ?иÑ?е ове догаÑ?аÑ?е."
+#: ../calendar/gui/calendar-commands.c:331
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "Ð?ва Ñ?е Ñ?адÑ?а Ñ?Ñ?аÑ?но обÑ?иÑ?аÑ?и Ñ?ве догаÑ?аÑ?е пÑ?е изабÑ?аног Ñ?ока. Уколико наÑ?Ñ?авиÑ?е, неÑ?еÑ?е моÑ?и да повÑ?аÑ?иÑ?е ове догаÑ?аÑ?е."
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Ð?збаÑ?и догаÑ?аÑ?е Ñ?Ñ?аÑ?иÑ?е од"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "дана"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152
+#: ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603
+#: ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Ð?а вебÑ?"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "РоÑ?ендани и годиÑ?Ñ?иÑ?е"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Ð?Ñ?еме"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291
+#: ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "РоÑ?ендани и годиÑ?Ñ?иÑ?е"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "Ð?ови _календаÑ?"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478
+#: ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483
+#: ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "_Ð?могÑ?Ñ?и за Ñ?ад ван мÑ?еже"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484
+#: ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_Ð?немогÑ?Ñ?и да ово бÑ?де доÑ?Ñ?Ñ?пно ван мÑ?еже"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
-msgstr "Ð?еÑ?Ñ?пела допÑ?на календаÑ?а."
+msgstr "Ð?еÑ?Ñ?пела догÑ?адÑ?а календаÑ?а."
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и календаÑ? â??%sâ?? за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и календаÑ? â??%sâ?? за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ð?ема доÑ?Ñ?Ñ?пног календаÑ?а за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "Ð?иÑ?аÑ? извоÑ?а календаÑ?а"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
-msgstr "Ð?ови заказани Ñ?аÑ?Ñ?анак"
+msgstr "Ð?ово заказиваÑ?е"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
-msgstr "_Ð?аказано"
+msgstr "_Ð?аказиваÑ?е"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
-msgstr "Ð?аказÑ?Ñ?е нови Ñ?аÑ?Ñ?анак"
+msgstr "Ð?Ñ?ави ново заказиваÑ?е"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Ð?ови Ñ?аÑ?Ñ?анак"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "С_аÑ?Ñ?анак"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Ð?Ñ?ави нови заÑ?Ñ?ев за Ñ?аÑ?Ñ?анком"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Ð?ови Ñ?елодневни Ñ?аÑ?Ñ?анак"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Целодневно за_казиваÑ?е"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
-msgstr "Ð?Ñ?ави нови Ñ?елодневни Ñ?аÑ?Ñ?анак"
+msgstr "Ð?Ñ?ави ново Ñ?елодневно заказиваÑ?е"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Ð?ови календаÑ?"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Ð?але_ндаÑ?"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Ð?Ñ?ави нови календаÑ?"
 
@@ -5619,13 +4121,16 @@ msgstr "Ð?едеÑ?ни пÑ?еглед"
 msgid "Month View"
 msgstr "Ð?еÑ?еÑ?ни пÑ?еглед"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Ð?ило коÑ?е поÑ?е"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Ð?Ñ?илози"
 
@@ -5635,60 +4140,83 @@ msgstr "Ð?Ñ?илози"
 msgid "Attendee"
 msgstr "_УÑ?еÑ?ник"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Ð?аÑ?егоÑ?иÑ?а"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "РазвÑ?Ñ?Ñ?аваÑ?е"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370
+#: ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Ð?овеÑ?Ñ?иво"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Ð?пиÑ?"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Ð?пиÑ?и"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Ð?е поÑ?Ñ?оÑ?и"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Ð?оÑ?Ñ?оÑ?и"
 
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Ð?еÑ?Ñ?о"
+
 #: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Ð?Ñ?ганизаÑ?оÑ?"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368
+#: ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Ð?иÑ?но"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359
+#: ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Ð?авно"
 
@@ -5698,66 +4226,97 @@ msgid "Recurrence"
 msgstr "УÑ?еÑ?Ñ?алоÑ?Ñ?"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
-msgstr "Ð?Ñ?еглед"
+msgstr "СажеÑ?ак"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
-msgstr "Ð?Ñ?егледи"
+msgstr "СажеÑ?ак Ñ?адÑ?жи"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "Ñ?адÑ?жи"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "не Ñ?адÑ?жи"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "Ñ?е"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ниÑ?е"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и оÑ?ваÑ?аÑ?Ñ? календаÑ?а"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Ð?еÑ?од ниÑ?е подÑ?жан пÑ?и оÑ?ваÑ?аÑ?Ñ? календаÑ?а"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Ð?абÑ?аÑ?ен пÑ?иÑ?Ñ?Ñ?п календаÑ?Ñ?"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Ð?епознаÑ?а гÑ?еÑ?ка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:607
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Ð?авиÑ? Ñ?аÑ?"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Ð?Ñ?каÑ?Ñ?Ñ?е Ñ?позоÑ?еÑ?е"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Ð?Ñ?Ñ?Ñ?а звÑ?к"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Ð?окÑ?еÑ?е пÑ?огÑ?ам"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "ШаÑ?е елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?кÑ?"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Ð?лаÑ?м</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
-msgstr "<b>Ð?одеÑ?аваÑ?а</b>"
+msgstr "<b>Ð?пÑ?иÑ?е</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
@@ -5780,84 +4339,78 @@ msgid "Mes_sage:"
 msgstr "Ð?о_Ñ?Ñ?ка:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Ð?Ñ?Ñ?Ñ?а звÑ?к"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Ð?Ñ?каÑ?Ñ?Ñ?е Ñ?позоÑ?еÑ?е"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Ð?окÑ?еÑ?е пÑ?огÑ?ам"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Ð?оÑ?аÑ?и:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "ШаÑ?е елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?кÑ?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Ð?Ñ?гÑ?менÑ?и:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Ð?Ñ?огÑ?ам:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "Ð?о_нови алаÑ?м"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Ð?вÑ?к:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "поÑ?ле"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "пÑ?е"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "дан(и)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "кÑ?аÑ? Ñ?аÑ?Ñ?анка"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"пÑ?е\n"
+"поÑ?ле"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
-msgstr "покажи Ñ?оÑ? на Ñ?вакиÑ?"
+msgstr "пÑ?икажи Ñ?оÑ? на Ñ?вакиÑ?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "Ñ?аÑ?(и)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"минÑ?Ñ?(и)\n"
+"Ñ?аÑ?(и)\n"
+"дан(и)"
 
-# bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "минÑ?Ñ?(и)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"минÑ?Ñ?и\n"
+"Ñ?аÑ?и\n"
+"дани"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "поÑ?еÑ?ак заказаног Ñ?аÑ?Ñ?анка"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#| msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"заказани поÑ?еÑ?ак\n"
+"заказани кÑ?аÑ?"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5868,17 +4421,18 @@ msgid "A_dd"
 msgstr "_Ð?одаÑ?"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Ð?лаÑ?ми"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ð?Ñ?едложи аÑ?Ñ?омаÑ?Ñ?ки пÑ?иказ пÑ?илога"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Ð?Ñ?илаже даÑ?оÑ?екÑ?(е)"
 
@@ -5888,35 +4442,47 @@ msgstr "Ð?Ñ?илаже даÑ?оÑ?екÑ?(е)"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150
+#: ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717
+#: ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435
+#: ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312
+#: ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Ð?иÑ?Ñ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Ð?забÑ?ани календаÑ?и за коÑ?е звони Ñ?аÑ?"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#| msgid "Time zone:"
+msgid "Time and date:"
+msgstr "Ð?Ñ?еме и даÑ?Ñ?м:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#| msgid "Date:"
+msgid "Date only:"
+msgstr "Само даÑ?Ñ?м:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
-msgstr ""
+msgstr "(Ð?Ñ?иказано Ñ? Ð?невном пÑ?егледÑ?)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
@@ -5934,58 +4500,67 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u и %d Ñ?е биÑ?и замеÑ?ени коÑ?иÑ?ником и доменом из елекÑ?Ñ?онÑ?ке адÑ?еÑ?е.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u и %d Ñ?е биÑ?и замеÑ?ени коÑ?иÑ?ником и доменом из елекÑ?Ñ?онÑ?ке адÑ?еÑ?е.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+#| msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Ð?лаÑ?ми</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">УпозоÑ?еÑ?а</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+#| msgid "<span weight=\"bold\">Time</span>"
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">ФоÑ?маÑ? даÑ?Ñ?м/вÑ?еме</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr ""
-"<span weight=\"bold\">Ð?одÑ?азÑ?мевани Ñ?еÑ?веÑ? Ñ?лободног/заÑ?зеÑ?ог вÑ?емена</span>"
+msgstr "<span weight=\"bold\">Ð?одÑ?азÑ?мевани Ñ?еÑ?веÑ? Ñ?лободног/заÑ?зеÑ?ог вÑ?емена</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Ð?пÑ?Ñ?е</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">СпиÑ?ак задÑ?жеÑ?а</span>"
+msgstr "<span weight=\"bold\">СпиÑ?ак задаÑ?ака</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Ð?Ñ?еме</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Радна Ñ?едмиÑ?а</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Ð?одеÑ?и за _леÑ?Ñ?е Ñ?аÑ?Ñ?наÑ?е вÑ?емена"
+msgstr "<span weight=\"bold\">Радна недеÑ?а</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Ð?Ñ?аÑ? _дана:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Ð?Ñ?иказ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#| msgid "Show display alarms in notification tray"
+msgid "Display alarms in _notification area only"
+msgstr "Ð?Ñ?иказÑ?Ñ?е алаÑ?ме Ñ?амо Ñ? _обавеÑ?Ñ?аÑ?ноÑ? зони"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Ð?еÑ?ак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5995,13 +4570,13 @@ msgstr ""
 "СаÑ?и\n"
 "Ð?ана"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Ð?онедеÑ?ак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -6019,218 +4594,234 @@ msgstr ""
 "СÑ?боÑ?а\n"
 "Ð?едеÑ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Ð?иÑ?а боÑ?Ñ?"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "Ð?_ед"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "СÑ?боÑ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "Ð?Ñ?и_казÑ?Ñ?е Ð?еÑ?еÑ?ни пÑ?еглед по недеÑ?ама"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?_га зона:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Ð?забеÑ?и календаÑ?е за звÑ?Ñ?но обавеÑ?Ñ?еÑ?е"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Ð?Ñ?и_кажи подÑ?еÑ?ник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
-msgstr "Ð?Ñ?и_кажи подÑ?еÑ?ник"
+msgstr "Ð?Ñ?икажи _подÑ?еÑ?ник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Ð?Ñ?икажи _бÑ?оÑ?еве недеÑ?а Ñ? делÑ? за даÑ?Ñ?м"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
-msgstr "Ð?Ñ?иказÑ?Ñ?е бÑ?оÑ?еве недеÑ?а Ñ? делÑ? за даÑ?Ñ?м"
+msgstr "Ð?Ñ?иказÑ?Ñ?е _бÑ?оÑ? недеÑ?е Ñ? пÑ?егледÑ? за дан и Ñ?аднÑ? недеÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Ð?едеÑ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
-msgstr "Ð?_адÑ?жеÑ?а за данаÑ?:"
+msgstr "Ð?_адаÑ?и за данаÑ?:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "У_Ñ?о"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Ð?одел:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "ЧеÑ?вÑ?Ñ?ак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Ð?Ñ?еменÑ?ка _зона:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Ð?блик вÑ?емена:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "УÑ?оÑ?ак"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#| msgid "Show the second time zone"
+msgid "Use s_ystem time zone"
+msgstr "Ð?оÑ?иÑ?Ñ?и вÑ?еменÑ?кÑ? зонÑ? _Ñ?иÑ?Ñ?ема"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "СÑ?еда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "Ð?оÑ?еÑ?ак н_едеÑ?е:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Радни дани:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - Ñ?аÑ?овни (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 - Ñ?аÑ?овни"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
-msgstr "_ТÑ?ажи поÑ?вÑ?дÑ? за бÑ?иÑ?аÑ?е пÑ?едмеÑ?а"
+msgstr "_ТÑ?ажи поÑ?вÑ?дÑ? за бÑ?иÑ?аÑ?е Ñ?Ñ?авки"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Сажми недеÑ?е Ñ? меÑ?еÑ?ни пÑ?еглед"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "Ð?оÑ?еÑ?ак _дана:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Ð?еÑ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
-msgstr "_СакÑ?иÑ? завÑ?Ñ?ена задÑ?жеÑ?а поÑ?ле"
+msgstr "_СакÑ?иÑ? завÑ?Ñ?ене задаÑ?ке поÑ?ле"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Ð?он"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
-msgstr "_Ð?еиÑ?пÑ?Ñ?ена задÑ?жеÑ?а:"
+msgstr "_Ð?еиÑ?пÑ?Ñ?ени задаÑ?и:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_СÑ?б"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
-msgstr "_Ð?Ñ?икажи вÑ?емена завÑ?Ñ?еÑ?ка Ñ?аÑ?Ñ?анака Ñ? недеÑ?ним и меÑ?еÑ?ним пÑ?егледима"
+msgstr "_Ð?Ñ?икажи заказана вÑ?емена завÑ?Ñ?еÑ?ка Ñ? недеÑ?ним и меÑ?еÑ?ним пÑ?егледима"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "Ð?оделе _вÑ?емена:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_УÑ?о"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_СÑ?е"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
-msgstr ""
+msgstr "пÑ?е Ñ?ваке годиÑ?Ñ?иÑ?е/Ñ?оÑ?ендана"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
-msgstr "пÑ?е Ñ?ваког Ñ?аÑ?Ñ?анка"
+msgstr "пÑ?е Ñ?ваког заказиваÑ?а"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Тип:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Умножава Ñ?адÑ?жаÑ? календаÑ?а локално за Ñ?ад ван мÑ?еже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
-msgstr "_Умножава Ñ?адÑ?жаÑ? лиÑ?Ñ?е задÑ?жеÑ?а локално за Ñ?ад ван мÑ?еже"
+msgstr "_Умножава Ñ?адÑ?жаÑ? Ñ?пиÑ?ка задаÑ?ака локално за Ñ?ад ван мÑ?еже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_Умножава Ñ?адÑ?жаÑ? Ñ?пиÑ?ка белеÑ?ки локално за Ñ?ад ван мÑ?еже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Ð?оÑ?_а:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
-msgstr "СпиÑ?ак задÑ?жеÑ?а"
+msgstr "СпиÑ?ак задаÑ?ака"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "СпиÑ?ак белеÑ?ки"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Ð?Ñ?обине календаÑ?а"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Ð?ови календаÑ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
-msgstr "Ð?Ñ?обине лиÑ?Ñ?е задÑ?жеÑ?а"
+msgstr "Ð?Ñ?обине Ñ?пиÑ?ка задаÑ?ака"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
-msgstr "Ð?о_ви Ñ?пиÑ?ак задÑ?жеÑ?а"
+msgstr "Ð?о_ви Ñ?пиÑ?ак задаÑ?ака"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
-msgstr "Ð?Ñ?обине лиÑ?Ñ?е задÑ?жеÑ?а"
+msgstr "Ð?Ñ?обине Ñ?пиÑ?ка задаÑ?ака"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
-msgstr "Ð?ови Ñ?пиÑ?ак белеÑ?ки"
+msgstr "Ð?ови Ñ?пиÑ?ак задаÑ?ака"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -6238,7 +4829,7 @@ msgstr "Ð?ваÑ? догаÑ?аÑ? Ñ?е обÑ?иÑ?ан."
 
 #: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
-msgstr "Ð?во задÑ?жеÑ?е Ñ?е обÑ?иÑ?ано."
+msgstr "Ð?ваÑ? задаÑ?ак Ñ?е обÑ?иÑ?ан."
 
 #: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
@@ -6260,7 +4851,7 @@ 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."
@@ -6281,300 +4872,249 @@ msgstr "%s  Ð?иÑ?Ñ?е наÑ?инили пÑ?омене, оÑ?вежиÑ?и Ñ?Ñ?е
 msgid "Validation error: %s"
 msgstr "Ð?Ñ?еÑ?ка пÑ?овеÑ?е: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189
+#: ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " за "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Ð?авÑ?Ñ?ено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Ð?авÑ?Ñ?ено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Ð?о "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202
+#: ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Ð?о "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Ð?Ñ?иложена поÑ?Ñ?ка - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d пÑ?иложена поÑ?Ñ?ка"
-msgstr[1] "%d пÑ?иложене поÑ?Ñ?ке"
-msgstr[2] "%d пÑ?иложениÑ? поÑ?Ñ?ка"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "Ð?Ñ?е_меÑ?Ñ?и"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+#| msgid "Save attachments"
+msgid "Could not save attachments"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?аÑ?Ñ?ваÑ?и пÑ?илоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Ð?Ñ?кажи _пÑ?евлаÑ?еÑ?е"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:456
-msgid "attachment"
-msgstr "пÑ?илог"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?вежиÑ?и обÑ?екаÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
-msgstr "УÑ?еди заказани Ñ?аÑ?Ñ?анак"
+msgstr "УÑ?еди заказиваÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "СаÑ?Ñ?анак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
-msgstr "Ð?аказани Ñ?аÑ?Ñ?анак - %s"
+msgstr "Ð?аказиваÑ?е - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Ð?одеÑ?ено задÑ?жеÑ?е - %s"
+msgstr "Ð?одеÑ?ен задаÑ?ак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
-msgstr "Ð?адÑ?жеÑ?е - %s"
+msgstr "Ð?адаÑ?ак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Ð?елеÑ?ка - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
-msgstr "Ð?ез пÑ?егледа"
+msgstr "Ð?ез Ñ?ажеÑ?ка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
-msgstr ""
+msgstr "Ð?адÑ?жаÑ?и оÑ?игиналнÑ? Ñ?Ñ?авкÑ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да заÑ?воÑ?иÑ?е Ñ?екÑ?Ñ?и пÑ?озоÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Умножи изабÑ?ани Ñ?екÑ?Ñ? Ñ? Ñ?пиÑ?ак иÑ?еÑ?ака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "СеÑ?е изабÑ?ани Ñ?екÑ?Ñ? Ñ? Ñ?пиÑ?ак иÑ?еÑ?ака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде за доÑ?Ñ?Ñ?пнÑ? помоÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "УбаÑ?и Ñ?екÑ?Ñ? из лиÑ?Ñ?е иÑ?еÑ?ака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да Ñ?аÑ?Ñ?ваÑ?е Ñ?екÑ?Ñ?и пÑ?озоÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Ð?забеÑ?и Ñ?ав Ñ?екÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "Ð?зна_ка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "Ð?аÑ?о_Ñ?ека"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Ð?омоÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "_УмеÑ?ни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
-msgstr "_Ð?огÑ?Ñ?ноÑ?Ñ?и"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+msgstr "_Ð?пÑ?иÑ?е"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../mail/em-folder-tree.c:2106
+#: ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "Ð?_Ñ?еглед"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Ð?Ñ?илог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
-msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да пÑ?иложиÑ?е неки докÑ?менÑ?"
+msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да пÑ?иложиÑ?е докÑ?менÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "Ð?а_Ñ?егоÑ?иÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "Ð?иÑ?а да ли да пÑ?икаже каÑ?егоÑ?иÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "Ð?Ñ?еменÑ?ка _зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "Ð?иÑ?а да ли да пÑ?икаже вÑ?еменÑ?кÑ? зонÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "_Ð?авно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "Ð?знаÑ?и као Ñ?авно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "Ð?_иÑ?но"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "Ð?знаÑ?и као лиÑ?но"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "Ð?ове_Ñ?Ñ?иво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "Ð?знаÑ?и као повеÑ?Ñ?иво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "_Улога поÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Улога пÑ?иказано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е RSVP пÑ?иказано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "_СÑ?аÑ?е поÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
-msgstr "Ð?иÑ?а да ли да пÑ?икаже поÑ?е Ñ?а Ñ?Ñ?аÑ?ем"
+msgstr "Ð?иÑ?а да ли да пÑ?икаже поÑ?е Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
-msgstr "_Ð?Ñ?Ñ?Ñ?а поÑ?е"
+msgstr "_Тип поÑ?а"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Ð?иÑ?а да ли Ñ?е пÑ?иказана вÑ?Ñ?Ñ?а пÑ?иÑ?Ñ?Ñ?ниÑ?"
+msgstr "Ð?иÑ?а да ли Ñ?е пÑ?иказан Ñ?ип пÑ?иÑ?Ñ?Ñ?ниÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "СкоÑ?аÑ?Ñ?и _докÑ?менÑ?и"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Ð?Ñ?иложи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> пÑ?илог"
-msgstr[1] "<b>%d</b> пÑ?илога"
-msgstr[2] "<b>%d</b> пÑ?илога"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "СакÑ?иÑ? линиÑ?Ñ? пÑ?и_лога"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "Ð?Ñ?икажи линиÑ?Ñ? п_Ñ?илога"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_Ð?одаÑ? пÑ?илог..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "Ð?Ñ?икажи п_Ñ?илоге"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е Ñ?азмак за пÑ?иказ(Ñ?акÑ?иваÑ?е) линиÑ?е пÑ?илога"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "СаÑ?Ñ?ваÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Ð?Ñ?омене наÑ?иÑ?ене на овом пÑ?едмеÑ?Ñ? могÑ? биÑ?и занемаÑ?ене ако бÑ?де оÑ?вежен"
+msgstr "Ð?Ñ?омене наÑ?иÑ?ене на овоÑ? Ñ?Ñ?авки могÑ? биÑ?и занемаÑ?ене ако бÑ?де ажÑ?Ñ?иÑ?ано"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2801
+#: ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "пÑ?илог"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "Ð?иÑ?е могÑ?Ñ?е коÑ?иÑ?Ñ?еÑ?е Ñ?екÑ?Ñ?е веÑ?зиÑ?е!"
 
@@ -6600,7 +5140,7 @@ msgstr "Ð?огаÑ?аÑ? ниÑ?е могао биÑ?и обÑ?иÑ?ан због corb
 
 #: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
-msgstr "Ð?адÑ?жеÑ?е ниÑ?е могло биÑ?и избÑ?иÑ?ано због corba гÑ?еÑ?ке"
+msgstr "Ð?адаÑ?ак ниÑ?е могао биÑ?и избÑ?иÑ?ан због corba гÑ?еÑ?ке"
 
 #: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
@@ -6608,7 +5148,7 @@ msgstr "Ð?елеÑ?ка ниÑ?е могло биÑ?и обÑ?иÑ?ана због co
 
 #: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
-msgstr "Ð?Ñ?едмеÑ? ниÑ?е могао биÑ?и обÑ?иÑ?ан због corba гÑ?еÑ?ке"
+msgstr "СÑ?авка ниÑ?е могла биÑ?и обÑ?иÑ?ана због corba гÑ?еÑ?ке"
 
 #: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
@@ -6616,7 +5156,7 @@ msgstr "Ð?огаÑ?аÑ? ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?еÑ? пÑ?и
 
 #: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
-msgstr "Ð?адÑ?жеÑ?е ниÑ?е могло биÑ?и обÑ?иÑ?ано Ñ?еÑ? пÑ?иÑ?Ñ?Ñ?п ниÑ?е дозвоÑ?ен"
+msgstr "Ð?адаÑ?ак ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?еÑ? пÑ?иÑ?Ñ?Ñ?п ниÑ?е дозвоÑ?ен"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
@@ -6624,7 +5164,7 @@ msgstr "Ð?елеÑ?ка ниÑ?е могла биÑ?и обÑ?иÑ?ана Ñ?еÑ? пÑ?
 
 #: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
-msgstr "Ð?Ñ?едмеÑ? ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?еÑ? пÑ?иÑ?Ñ?Ñ?п ниÑ?е дозвоÑ?ен"
+msgstr "СÑ?авка ниÑ?е могла биÑ?и обÑ?иÑ?ана Ñ?еÑ? пÑ?иÑ?Ñ?Ñ?п ниÑ?е дозвоÑ?ен"
 
 #: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
@@ -6632,7 +5172,7 @@ msgstr "Ð?огаÑ?аÑ? ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?Ñ?лед г
 
 #: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
-msgstr "Ð?адÑ?жеÑ?е ниÑ?е могло биÑ?и обÑ?иÑ?ано Ñ?Ñ?лед гÑ?еÑ?ке"
+msgstr "Ð?адаÑ?ак ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?Ñ?лед гÑ?еÑ?ке"
 
 #: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
@@ -6640,16 +5180,16 @@ msgstr "Ð?елеÑ?ка ниÑ?е могла биÑ?и обÑ?иÑ?ана Ñ?Ñ?лед
 
 #: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
-msgstr "Ð?Ñ?едмеÑ? ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?Ñ?лед гÑ?еÑ?ке"
+msgstr "СÑ?авка ниÑ?е могла биÑ?и обÑ?иÑ?ана Ñ?Ñ?лед гÑ?еÑ?ке"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Ð?онÑ?акÑ?и..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
-msgstr "Ð?елегиÑ?аÑ?:"
+msgstr "Ð?елегиÑ?аÑ? на:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
@@ -6661,27 +5201,27 @@ msgstr "Ð?ла_Ñ?ми"
 
 #: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
-msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да навиÑ?еÑ?е или иÑ?кÑ?Ñ?Ñ?иÑ?е Ñ?аÑ? за оваÑ? догаÑ?аÑ?"
+msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да поÑ?Ñ?авиÑ?е или иÑ?кÑ?Ñ?Ñ?иÑ?е алаÑ?м за оваÑ? догаÑ?аÑ?"
 
 #: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
-msgstr "УÑ?еÑ?Ñ?а_лоÑ?Ñ?"
+msgstr "_Ð?онавÑ?аÑ?е"
 
 #: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
-msgstr "Ð?ека ова поÑ?ава бÑ?де покÑ?еÑ?на"
+msgstr "Ð?ека Ñ?е оваÑ? догаÑ?аÑ? понавÑ?а"
 
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Ð?пÑ?иÑ?е Ñ?лаÑ?а"
 
 #: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
-msgstr "УмеÑ?ни напÑ?едне могÑ?Ñ?ноÑ?Ñ?и Ñ?лаÑ?а"
+msgstr "УмеÑ?ни напÑ?едне опÑ?иÑ?е Ñ?лаÑ?а"
 
 #: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
@@ -6689,7 +5229,7 @@ msgstr "Целодневни догаÑ?а_Ñ?"
 
 #: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
-msgstr "Ð?иÑ?а да ли дозволиÑ?и Ñ?елодневне догаÑ?аÑ?е"
+msgstr "Ð?иÑ?а да ли дозвоÑ?ава Ñ?елодневне догаÑ?аÑ?е"
 
 #: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
@@ -6709,205 +5249,242 @@ msgstr "Ð?аÑ?Ñ?ажи подаÑ?ак за Ñ?лободно/заÑ?зеÑ?о вÑ?
 
 #: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
-msgstr "Ð?ака_зани Ñ?аÑ?Ñ?анак"
+msgstr "Ð?аказа_но"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "Ð?огаÑ?аÑ? ниÑ?е могÑ?Ñ?е Ñ?Ñ?еÑ?иваÑ?и, поÑ?Ñ?о Ñ?е изабÑ?ани календаÑ? Ñ?амо за Ñ?иÑ?аÑ?е"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Ð?огаÑ?аÑ? ниÑ?е могÑ?Ñ?е поÑ?пÑ?но Ñ?Ñ?едиÑ?и, поÑ?Ñ?о ниÑ?Ñ?е оÑ?ганизаÑ?оÑ?"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
-msgstr "Ð?а оваÑ? догаÑ?аÑ? Ñ?е навиÑ?ен Ñ?аÑ?"
+msgstr "Ð?ваÑ? догаÑ?аÑ? има алаÑ?ме"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ð?Ñ?_ганизаÑ?оÑ?:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "Ð?елегаÑ?_и"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "УÑ?_еÑ?ниÑ?и"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Ð?огаÑ?аÑ? без даÑ?Ñ?ма поÑ?еÑ?ка"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Ð?огаÑ?аÑ? без даÑ?Ñ?ма завÑ?Ñ?еÑ?ка"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "Ð?аÑ?Ñ?м поÑ?еÑ?ка Ñ?е погÑ?еÑ?ан"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Ð?аÑ?Ñ?м завÑ?Ñ?еÑ?ка Ñ?е погÑ?еÑ?ан"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Ð?Ñ?еме поÑ?еÑ?ка Ñ?е погÑ?еÑ?но"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Ð?Ñ?еме завÑ?Ñ?еÑ?ка Ñ?е погÑ?еÑ?но"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "Ð?забÑ?ани оÑ?ганизаÑ?оÑ? виÑ?е нема налог."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "Ð?оÑ?Ñ?ебан Ñ?е оÑ?ганизаÑ?оÑ?."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "Ð?аÑ?маÑ?е Ñ?едан Ñ?Ñ?еÑ?ник Ñ?е поÑ?Ñ?ебан."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Ð?одаÑ? "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е календаÑ?а â??%sâ??."
-
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е календаÑ?а â??%sâ??."
+
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Ð?елÑ?Ñ?еÑ?е Ñ? име %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "%d дан пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-msgstr[1] "%d дана пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-msgstr[2] "%d дана пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+msgstr[0] "%d дан пÑ?е заказаног"
+msgstr[1] "%d дана пÑ?е заказаног"
+msgstr[2] "%d дана пÑ?е заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "%d Ñ?аÑ? пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-msgstr[1] "%d Ñ?аÑ?а пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-msgstr[2] "%d Ñ?аÑ?и пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+msgstr[0] "%d Ñ?аÑ? пÑ?е заказаног"
+msgstr[1] "%d Ñ?аÑ?а пÑ?е заказаног"
+msgstr[2] "%d Ñ?аÑ?и пÑ?е заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "%d минÑ?Ñ? пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-msgstr[1] "%d минÑ?Ñ?а пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-msgstr[2] "%d минÑ?Ñ?а пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+msgstr[0] "%d минÑ?Ñ? пÑ?е заказаног"
+msgstr[1] "%d минÑ?Ñ?а пÑ?е заказаног"
+msgstr[2] "%d минÑ?Ñ?а пÑ?е заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Ð?Ñ?илагоди"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "1 дан пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "1 Ñ?аÑ? пÑ?е заказаног Ñ?аÑ?Ñ?анка"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 минÑ?Ñ?а пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 минÑ?Ñ?а пÑ?е заказаног\n"
+"1 Ñ?аÑ? пÑ?е заказаног\n"
+"1 дан пÑ?е заказаног"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "УÑ?_еÑ?ниÑ?и..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Custom Alarm:"
-msgstr "Ð?Ñ?илагоÑ?ен звÑ?к алаÑ?ма:"
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "УÑ?еÑ?ниÑ?и"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "Ð?Ñ?илагоÑ?ен алаÑ?м:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Ð?пиÑ? догаÑ?аÑ?а"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
-msgstr "У кÑ?аÑ?ким Ñ?Ñ?Ñ?ама:"
+msgstr "Саже_Ñ?ак:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Ð?лаÑ?м"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Ð?пиÑ?:"
 
-# note(slobo): можда Ñ?Ñ?еба Ñ?ок
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Ð?окаÑ?иÑ?а:"
+
+# note(slobo): можда Ñ?Ñ?еба Ñ?ок
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Ð?Ñ?еме:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "за"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"а\n"
+"б"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "до"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>УÑ?еÑ?ни_Ñ?и</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "_Ð?Ñ?омени оÑ?ганизаÑ?оÑ?а"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Ð?онÑ?а_кÑ?и..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Ð?Ñ?ганизаÑ?оÑ?:"
+#| msgid "until"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"за\n"
+"до"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111
+#: ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Ð?елеÑ?ка"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Ð?елеÑ?кÑ? ниÑ?е могÑ?Ñ?е Ñ?Ñ?еÑ?иваÑ?и, поÑ?Ñ?о Ñ?е изабÑ?ан Ñ?пиÑ?ак Ñ?амо за Ñ?иÑ?аÑ?е"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Ð?елеÑ?кÑ? ниÑ?е могÑ?Ñ?е поÑ?пÑ?но Ñ?Ñ?едиÑ?и, поÑ?Ñ?о ниÑ?Ñ?е оÑ?ганизаÑ?оÑ?"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е белеÑ?ки Ñ? â??%sâ??."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031
+#: ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624
+#: ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78
+#: ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Ð?Ñ?има"
 
@@ -6921,7 +5498,7 @@ msgid "T_o:"
 msgstr "_Ð?Ñ?има:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ð?Ñ?Ñ?па:"
@@ -6929,43 +5506,42 @@ msgstr "_Ð?Ñ?Ñ?па:"
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Ð?еÑ?аÑ?е повÑ?аÑ?ни догаÑ?аÑ?, Ñ?Ñ?а желиÑ?е да измениÑ?е?"
+msgstr "Ð?еÑ?аÑ?е повÑ?аÑ?ни догаÑ?аÑ?. ШÑ?а желиÑ?е да измениÑ?е?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Ð?елегиÑ?аÑ?е повÑ?аÑ?ни догаÑ?аÑ?, Ñ?Ñ?а желиÑ?е да делегиÑ?аÑ?е?"
+msgstr "Ð?елегиÑ?аÑ?е повÑ?аÑ?ни догаÑ?аÑ?. ШÑ?а желиÑ?е да делегиÑ?аÑ?е?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Ð?еÑ?аÑ?е повÑ?аÑ?но задÑ?жеÑ?е, Ñ?Ñ?а желиÑ?е да измениÑ?е?"
+msgstr "Ð?еÑ?аÑ?е повÑ?аÑ?ни задаÑ?ак. ШÑ?а желиÑ?е да измениÑ?е?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Ð?еÑ?аÑ?е повÑ?аÑ?нÑ? белеÑ?кÑ?. ШÑ?а желиÑ?е да измениÑ?е?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Само оваÑ? Ñ?ноÑ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Ð?ваÑ? и пÑ?еÑ?Ñ?одне Ñ?ноÑ?е"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Ð?ваÑ? и бÑ?дÑ?Ñ?е Ñ?ноÑ?е"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Све Ñ?ноÑ?е"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Ð?ваÑ? заказани Ñ?аÑ?Ñ?анак Ñ?адÑ?жи понавÑ?аÑ?а коÑ?а Ð?волÑ?Ñ?иÑ?а не може да Ñ?Ñ?еди."
+msgstr "Ð?во заказиваÑ?е Ñ?адÑ?жи понавÑ?аÑ?а коÑ?а Ð?волÑ?Ñ?иÑ?а не може да Ñ?Ñ?еди."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
@@ -6973,7 +5549,7 @@ 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.
@@ -6985,7 +5561,7 @@ msgstr "на"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "пÑ?воÑ?"
 
@@ -6994,7 +5570,7 @@ msgstr "пÑ?воÑ?"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "дÑ?Ñ?гоÑ?"
 
@@ -7002,7 +5578,7 @@ msgstr "дÑ?Ñ?гоÑ?"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "Ñ?Ñ?еÑ?оÑ?"
 
@@ -7010,21 +5586,30 @@ msgstr "Ñ?Ñ?еÑ?оÑ?"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "Ñ?еÑ?вÑ?Ñ?оÑ?"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#| msgid "Width"
+msgid "fifth"
+msgstr "пеÑ?и"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "поÑ?ледÑ?оÑ?"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Ð?Ñ?Ñ?ги даÑ?Ñ?м"
 
@@ -7032,7 +5617,7 @@ msgstr "Ð?Ñ?Ñ?ги даÑ?Ñ?м"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "од пÑ?вог до деÑ?еÑ?ог"
 
@@ -7040,7 +5625,7 @@ msgstr "од пÑ?вог до деÑ?еÑ?ог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "од Ñ?еданаеÑ?Ñ?ог до двадеÑ?еÑ?ог"
 
@@ -7048,45 +5633,45 @@ msgstr "од Ñ?еданаеÑ?Ñ?ог до двадеÑ?еÑ?ог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "од двадеÑ?еÑ? пÑ?вог до Ñ?Ñ?идеÑ?еÑ? пÑ?вог"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "дан"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "поÑ?аве"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Ð?одаÑ? изÑ?зеÑ?ак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Ð?е може да наÑ?е избоÑ? Ñ?ади меÑ?аÑ?а."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Ð?змени изÑ?зеÑ?ак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Ð?е може да наÑ?е избоÑ? Ñ?ади бÑ?иÑ?аÑ?а."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Ð?аÑ?Ñ?м/вÑ?еме"
 
@@ -7095,7 +5680,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Ð?зÑ?зеÑ?и</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Ð?Ñ?еглед</b>"
 
@@ -7103,52 +5688,59 @@ msgstr "<b>Ð?Ñ?еглед</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Ð?онавÑ?аÑ?е</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "СвакиÑ?"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
-msgstr "Ð?ваÑ? Ñ?аÑ?Ñ?анак Ñ?е по_навÑ?а"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "Ñ?век"
+msgstr "Ð?во заказиваÑ?е Ñ?е по_навÑ?а"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "меÑ?еÑ?(и)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"дан(и)\n"
+"недеÑ?а(е)\n"
+"меÑ?еÑ?(и)\n"
+"година(е)"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "недеÑ?а(е)"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "година(е)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"за\n"
+"до\n"
+"заÑ?век"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
-msgstr ""
+msgstr "Ð?оÑ?аÑ?и моÑ?е алаÑ?ме Ñ?а овим догаÑ?аÑ?ем"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+#| msgid "Notify new messages for _Inbox only"
+msgid "Notify new attendees _only"
+msgstr "Ð?бавеÑ?Ñ?и _Ñ?амо нове Ñ?Ñ?еÑ?нике"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Ð?аÑ?Ñ?м завÑ?Ñ?еÑ?ка Ñ?е погÑ?еÑ?ан"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
-msgstr "Ð?еб Ñ?Ñ?Ñ?ана"
+msgstr "Ð?еб Ñ?Ñ?Ñ?аниÑ?а"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
@@ -7158,75 +5750,38 @@ msgstr "<span weight=\"bold\">Разно</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">СÑ?аÑ?Ñ?Ñ?</span>"
 
-# timezone.
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "Ð?авÑ?Ñ?ено"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "Ð?иÑ?ока"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "У Ñ?окÑ?"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"Ð?иÑ?око\n"
+"Ð?оÑ?мално\n"
+"Ð?иÑ?ко\n"
+"Ð?еодÑ?еÑ?ено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Ð?ала"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "Ð?биÑ?на"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Ð?иÑ?е запоÑ?еÑ?о"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"Ð?иÑ?е запоÑ?еÑ?о\n"
+"У Ñ?окÑ?\n"
+"Ð?авÑ?Ñ?ено\n"
+"Ð?Ñ?казано"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "Ð?_Ñ?оÑ?енаÑ? завÑ?Ñ?еног:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "_СÑ?аÑ?е:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Ð?еодÑ?еÑ?ена"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Ð?аÑ?Ñ?м завÑ?Ñ?еÑ?ка:"
@@ -7242,38 +5797,48 @@ msgstr "_Ð?еб Ñ?Ñ?Ñ?аниÑ?а:"
 
 #: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
-msgstr "Ð?еÑ?_аÑ?и Ñ?Ñ?аÑ?а"
+msgstr "Ð?еÑ?_аÑ?и Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
 #: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
-msgstr "Ð?ликни за пÑ?оменÑ? или деÑ?аÑ?ан пÑ?еглед Ñ?Ñ?аÑ?а задÑ?жеÑ?а"
+msgstr "Ð?ликни за пÑ?оменÑ? или деÑ?аÑ?ан пÑ?еглед Ñ?Ñ?аÑ?Ñ?Ñ?а задаÑ?ка"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "Ð?ог_Ñ?Ñ?ноÑ?Ñ?и код Ñ?лаÑ?а"
 
 #: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
-msgstr "_Ð?адÑ?жеÑ?е"
+msgstr "_Ð?адаÑ?ак"
 
 #: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
-msgstr "Ð?еÑ?аÑ?и задÑ?жеÑ?а"
+msgstr "Ð?еÑ?аÑ?и задаÑ?ка"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Ð?адаÑ?ак ниÑ?е могÑ?Ñ?е Ñ?Ñ?еÑ?иваÑ?и, поÑ?Ñ?о Ñ?е изабÑ?ани Ñ?пиÑ?ак Ñ?амо за Ñ?иÑ?аÑ?е"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Ð?адаÑ?ак ниÑ?е могÑ?Ñ?е поÑ?пÑ?но Ñ?Ñ?едиÑ?и, поÑ?Ñ?о ниÑ?Ñ?е оÑ?ганизаÑ?оÑ?"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Ð?Ñ?гани_заÑ?оÑ?:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "Ð?аÑ?Ñ?м за завÑ?Ñ?еÑ?ак Ñ?е погÑ?еÑ?ан"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е задÑ?жеÑ?а Ñ? â??%sâ??."
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е задаÑ?ка Ñ? â??%sâ??."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
@@ -7318,42 +5883,42 @@ 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"
@@ -7369,80 +5934,180 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознаÑ? Ñ?ип покÑ?еÑ?аÑ?а"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#| msgid "Import"
+msgid "I_mport"
+msgstr "У_вези"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#| msgid "Select Calendar"
+msgid "Select a Calendar"
+msgstr "Ð?забеÑ?иÑ?е календаÑ?"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#| msgid "Select Task List"
+msgid "Select a Task List"
+msgstr "Ð?забеÑ?иÑ?е Ñ?пиÑ?ак задаÑ?ака"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#| msgid "Import to Calendar"
+msgid "I_mport to Calendar"
+msgstr "У_вези Ñ? календаÑ?"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+#| msgid "_Import to Tasks"
+msgid "I_mport to Tasks"
+msgstr "У_вези Ñ? задаÑ?ке"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67
+#: ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е да оÑ?воÑ?иÑ?е %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170
+#: ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Ð?еименовано"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Ð?аÑ?Ñ?м поÑ?еÑ?ка:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Ð?пиÑ?:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Ð?еб Ñ?Ñ?Ñ?аниÑ?а:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
-msgstr "Ð?Ñ?еглед:"
+msgstr "СажеÑ?ак:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Ð?аÑ?Ñ?м за завÑ?Ñ?еÑ?ак:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
-msgstr "СÑ?аÑ?е:"
+msgstr "СÑ?аÑ?Ñ?Ñ?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659
+#: ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "У Ñ?окÑ?"
+
+# timezone.
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660
+#: ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Ð?авÑ?Ñ?ено"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658
+#: ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ð?иÑ?е запоÑ?еÑ?о"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Ð?ажноÑ?Ñ?:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Ð?иÑ?ока"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076
+#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Ð?биÑ?на"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Ð?ала"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Ð?апÑ?авÑ?ено"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Ð?аÑ?Ñ?м завÑ?Ñ?еÑ?ка"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#| msgid "Modified"
+msgid "Last modified"
+msgstr "Ð?оÑ?ледÑ?е меÑ?ано"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Ð?аÑ?Ñ?м поÑ?еÑ?ка"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Слободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ð?аÑ?зеÑ?о"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7452,228 +6117,226 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027
+#: ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ð?а"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027
+#: ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ð?е"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995
+#: ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:827
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Ð?епознаÑ?о"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Ð?оновно"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Ð?одеÑ?ено"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "СаÑ?Ñ?ваÑ? као..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ? за Ñ?Ñ?ваÑ?е изабÑ?аниÑ? пÑ?илога..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "неименована_Ñ?лика.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_СаÑ?Ñ?ваÑ? као..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Ð?оÑ?Ñ?ави као _позадинÑ?"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_СаÑ?Ñ?ваÑ? изабÑ?ано"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "Ð?Ñ?воÑ?и Ñ? %s..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
-msgstr "* Ð?ез пÑ?егледа *"
+msgstr "* Ð?ез Ñ?ажеÑ?ка *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Ð?Ñ?ганизаÑ?оÑ?: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "Ð?Ñ?ганизаÑ?оÑ?: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "Ð?оÑ?еÑ?ак:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "Ð?о: "
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Ð?еодÑ?еÑ?ена"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659
+#: ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Ð?Ñ?иÑ?аÑ?е изабÑ?аниÑ? обÑ?екаÑ?а"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873
+#: ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
-msgstr "Ð?Ñ?вежаваÑ?е обÑ?екаÑ?а"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е обÑ?екаÑ?а"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333
+#: ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "СаÑ?Ñ?ваÑ? као..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
-msgstr "Ð?ово зад_Ñ?жеÑ?е"
+msgstr "Ð?ови зад_аÑ?ак"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Ð?Ñ?воÑ?и _Ð?еб Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807
+#: ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "_СаÑ?Ñ?ваÑ? као..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "Ш_Ñ?ампаÑ?..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812
+#: ../calendar/gui/e-memo-table.c:939
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ð?Ñ?еÑ?и"
 
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814
+#: ../calendar/gui/e-memo-table.c:941
+#: ../ui/evolution-addressbook.xml.h:57
+#: ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "У_баÑ?и"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
-msgstr "_Ð?одели задÑ?жеÑ?е"
+msgstr "_Ð?одели задаÑ?ак"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Ð?Ñ?оÑ?леди као иÐ?алендаÑ?"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
-msgstr "_Ð?бележи као завÑ?Ñ?ено"
+msgstr "_Ð?знаÑ?и као завÑ?Ñ?ено"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
-msgstr "_Ð?бележи изабÑ?ана задÑ?жеÑ?а као завÑ?Ñ?ена"
+msgstr "_Ð?знаÑ?и изабÑ?ане задаÑ?ке као завÑ?Ñ?ене"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
-msgstr "_Ð?бележи као незавÑ?Ñ?ено"
+msgstr "_Ð?знаÑ?и као незавÑ?Ñ?ено"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Ð?бележи изабÑ?ана задÑ?жеÑ?а као незавÑ?Ñ?ена"
+msgstr "_Ð?знаÑ?и изабÑ?ане задаÑ?ке као незавÑ?Ñ?ене"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
-msgstr "_Ð?бÑ?иÑ?и изабÑ?ана задÑ?жеÑ?а"
+msgstr "_Ð?бÑ?иÑ?и изабÑ?ане задаÑ?ке"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
-msgstr "Ð?ликниÑ?е за ново задÑ?жеÑ?е"
+msgstr "Ð?ликниÑ?е за нови задаÑ?ак"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -7688,152 +6351,161 @@ msgstr "Ð?авÑ?Ñ?ено"
 msgid "Completion date"
 msgstr "Ð?аÑ?Ñ?м завÑ?Ñ?еÑ?ка"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Ð?аÑ?Ñ?м за завÑ?Ñ?еÑ?ак"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Ð?ажноÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Ð?аÑ?Ñ?м поÑ?еÑ?ка"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "СÑ?аÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
-msgstr "Ð?Ñ?емеÑ?Ñ?аÑ?е пÑ?едмеÑ?а"
+msgstr "Ð?Ñ?емеÑ?Ñ?аÑ?е Ñ?Ñ?авки"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
-msgstr "УмножаваÑ?е пÑ?едмеÑ?а"
+msgstr "УмножаваÑ?е Ñ?Ñ?авки"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
-msgstr "Ð?ови _Ñ?аÑ?Ñ?анак..."
+msgstr "Ð?ово _заказиваÑ?е..."
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
-msgstr "Ð?ов Ñ?елодневни _догаÑ?аÑ?"
+msgstr "Ð?ови Ñ?елодневни _догаÑ?аÑ?"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "Ð?ови _Ñ?аÑ?Ñ?анак"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "_ТÑ?енÑ?Ñ?ни пÑ?еглед"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Ð?забеÑ?и _данаÑ?Ñ?и дан"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Ð?забеÑ?и даÑ?Ñ?м..."
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "ШÑ?ам_паÑ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи Ñ? календаÑ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "Ð?Ñ?ен_еÑ?и Ñ? календаÑ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Ð?елегиÑ?аÑ? Ñ?аÑ?Ñ?анак..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_Ð?акажи Ñ?аÑ?Ñ?анак..."
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Ð?Ñ?оÑ?леди као иÐ?алендаÑ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "Ð?_дговоÑ?и"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140
+#: ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Ð?дговоÑ?и _Ñ?вима"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Ð?ека ова поÑ?ава бÑ?де _покÑ?еÑ?на"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ð?бÑ?иÑ?и овÑ? _поÑ?авÑ?"
 
-#: ../calendar/gui/e-calendar-view.c:1838
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Ð?бÑ?иÑ?и _Ñ?ве поÑ?аве"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Ð?Ñ?иÑ?ваÑ?ено"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Ð?дбиÑ?ено"
 
-#: ../calendar/gui/e-calendar-view.c:2294
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Са Ñ?езеÑ?вом"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Ð?елегиÑ?ано"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "Ð?аÑ?Ñ?ева Ñ?адÑ?Ñ?"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Ð?еÑ?Ñ?о: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ð?Ñ?еме: %s %s"
@@ -7843,7 +6515,7 @@ msgstr "Ð?Ñ?еме: %s %s"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -7852,11 +6524,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7869,12 +6541,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i минÑ?Ñ?ни Ñ?азмаÑ?и"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "Ð?Ñ?икажи дÑ?Ñ?гÑ? вÑ?еменÑ?кÑ? зонÑ?"
 
@@ -7889,34 +6561,38 @@ msgstr "Ð?Ñ?икажи дÑ?Ñ?гÑ? вÑ?еменÑ?кÑ? зонÑ?"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840
+#: ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359
+#: ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:805
+#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:808
+#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2321
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "%d. недеÑ?а"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ð?а. (Сложено понавÑ?аÑ?е)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7924,7 +6600,7 @@ msgstr[0] "Сваки %d дан"
 msgstr[1] "Свака %d дана"
 msgstr[2] "СвакиÑ? %d дана"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7932,7 +6608,7 @@ msgstr[0] "Сваке %d недеÑ?е"
 msgstr[1] "Сваке %d недеÑ?е"
 msgstr[2] "СвакиÑ? %d недеÑ?а"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7941,22 +6617,22 @@ msgstr[1] "Сваке %d недеÑ?е Ñ? "
 msgstr[2] "СвакиÑ? %d недеÑ?а Ñ? "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s дан од "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s од "
 
 # Ñ?лиÑ?но као за недеÑ?е
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7965,7 +6641,7 @@ msgstr[1] "Ñ?вака %d меÑ?еÑ?а"
 msgstr[2] "Ñ?вакиÑ? %d меÑ?еÑ?и"
 
 # Ñ?лиÑ?но као за меÑ?еÑ?е и недеÑ?е
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7973,7 +6649,7 @@ msgstr[0] "Сваке %d године"
 msgstr[1] "Сваке %d године"
 msgstr[2] "СвакиÑ? %d година"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7982,36 +6658,39 @@ msgstr[1] "Ñ?кÑ?пно %d пÑ?Ñ?а"
 msgstr[2] "Ñ?кÑ?пно %d пÑ?Ñ?а"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", завÑ?Ñ?аваÑ?Ñ?Ñ?и Ñ?е "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Ð?оÑ?иÑ?е"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Ð?авÑ?Ñ?ава Ñ?е"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Рок"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995
+#: ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "иÐ?алендаÑ? подаÑ?и"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "иÐ?алендаÑ? гÑ?еÑ?ка"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111
+#: ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -8022,288 +6701,285 @@ msgid "An unknown person"
 msgstr "Ð?епознаÑ?а оÑ?оба"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Ð?Ñ?овеÑ?иÑ?е Ñ?ледеÑ?и подаÑ?ак, и поÑ?ом изабеÑ?иÑ?е Ñ?адÑ?Ñ? из доÑ?ег мениÑ?а."
+#: ../calendar/gui/e-itip-control.c:1135
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Ð?Ñ?овеÑ?иÑ?е Ñ?ледеÑ?и подаÑ?ак и поÑ?ом изабеÑ?иÑ?е Ñ?адÑ?Ñ? из доÑ?ег мениÑ?а."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Ð?Ñ?иÑ?ваÑ?ено Ñ? Ñ?езеÑ?вом"
 
-#: ../calendar/gui/e-itip-control.c:1278
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+#: ../calendar/gui/e-itip-control.c:1274
+msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "СаÑ?Ñ?анак Ñ?е оÑ?казан, меÑ?Ñ?Ñ?им ниÑ?е га могÑ?Ñ?е наÑ?и Ñ? Ð?аÑ?им календаÑ?има"
 
-#: ../calendar/gui/e-itip-control.c:1280
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Ð?адÑ?жеÑ?е Ñ?е оÑ?казано, меÑ?Ñ?Ñ?им ниÑ?е га могÑ?Ñ?е наÑ?и Ñ? Ð?аÑ?им Ñ?пиÑ?ковима задÑ?жеÑ?а"
+#: ../calendar/gui/e-itip-control.c:1276
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Ð?адаÑ?ак Ñ?е оÑ?казан, меÑ?Ñ?Ñ?им ниÑ?е га могÑ?Ñ?е наÑ?и Ñ? Ð?аÑ?им Ñ?пиÑ?ковима задаÑ?ака"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> обÑ?ави подаÑ?ак о Ñ?аÑ?Ñ?анкÑ?."
+msgstr "<b>%s</b> обÑ?авÑ?Ñ?Ñ?е подаÑ?ак о Ñ?аÑ?Ñ?анкÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Ð?одаÑ?ак о Ñ?аÑ?Ñ?анкÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> заÑ?Ñ?ева пÑ?иÑ?Ñ?Ñ?Ñ?во %s на Ñ?аÑ?Ñ?анкÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> заÑ?Ñ?ева Ð?аÑ?е пÑ?иÑ?Ñ?Ñ?Ñ?во на Ñ?аÑ?Ñ?анкÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Ð?Ñ?едлог за Ñ?аÑ?Ñ?анак"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> жели да бÑ?де део поÑ?Ñ?оÑ?еÑ?ег Ñ?аÑ?Ñ?анка."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
-msgstr "Ð?Ñ?вежаваÑ?е Ñ?аÑ?Ñ?анка"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е Ñ?аÑ?Ñ?анка"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> жели да добиÑ?е наÑ?новиÑ?а обавеÑ?Ñ?еÑ?а о Ñ?аÑ?Ñ?анкÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
-msgstr "Ð?аÑ?Ñ?ев за оÑ?вежаваÑ?ем Ñ?аÑ?Ñ?анка"
+msgstr "Ð?аÑ?Ñ?ев за ажÑ?Ñ?иÑ?аÑ?ем Ñ?аÑ?Ñ?анка"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> одговоÑ?и на заÑ?Ñ?ев за Ñ?аÑ?Ñ?анак."
+msgstr "<b>%s</b> одговаÑ?а на заÑ?Ñ?ев за Ñ?аÑ?Ñ?анак."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Ð?дговоÑ? за Ñ?аÑ?Ñ?анак"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> оÑ?каза Ñ?аÑ?Ñ?анак."
+msgstr "<b>%s</b> оÑ?казÑ?Ñ?е Ñ?аÑ?Ñ?анак."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Ð?Ñ?казиваÑ?е Ñ?аÑ?Ñ?анка"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> поÑ?ла неÑ?азÑ?мÑ?ивÑ? поÑ?Ñ?кÑ?."
+msgstr "<b>%s</b> Ñ?аÑ?е неÑ?азÑ?мÑ?ивÑ? поÑ?Ñ?кÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Ð?оÑ?а поÑ?Ñ?ка о Ñ?аÑ?Ñ?анкÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> обÑ?ави подаÑ?ак о задÑ?жеÑ?Ñ?."
+msgstr "<b>%s</b> обÑ?авÑ?Ñ?Ñ?е подаÑ?ак о задаÑ?кÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
-msgstr "Ð?одаÑ?ак о задÑ?жеÑ?Ñ?"
+msgstr "Ð?одаÑ?ак о задаÑ?кÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> Ñ?Ñ?ажи %s за извÑ?Ñ?аваÑ?е задÑ?жеÑ?а."
+msgstr "<b>%s</b> Ñ?Ñ?ажи %s за извÑ?Ñ?аваÑ?е задаÑ?ка."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> Ñ?Ñ?ажи да Ð?и извÑ?Ñ?иÑ?е задÑ?жеÑ?е."
+msgstr "<b>%s</b> Ñ?Ñ?ажи да Ð?и извÑ?Ñ?иÑ?е задаÑ?ак."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
-msgstr "Ð?Ñ?едлог за задÑ?жеÑ?е"
+msgstr "Ð?Ñ?едлог за задаÑ?ак"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b жели да бÑ?де део поÑ?Ñ?оÑ?еÑ?ег задÑ?жеÑ?а."
+msgstr "<b>%s</b жели да бÑ?де део поÑ?Ñ?оÑ?еÑ?ег задаÑ?ка."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
-msgstr "Ð?Ñ?вежаваÑ?е задÑ?жеÑ?а"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е задаÑ?ка"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> жели да пÑ?има наÑ?новиÑ?а обавеÑ?Ñ?еÑ?а о задÑ?жеÑ?Ñ?."
+msgstr "<b>%s</b> жели да пÑ?има наÑ?новиÑ?а обавеÑ?Ñ?еÑ?а о задаÑ?кÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
-msgstr "Ð?аÑ?Ñ?ев за оÑ?вежаваÑ?ем задÑ?жеÑ?а"
+msgstr "Ð?аÑ?Ñ?ев за ажÑ?Ñ?иÑ?аÑ?ем задаÑ?ка"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> одговоÑ?и на додеÑ?ено задÑ?жеÑ?е."
+msgstr "<b>%s</b> одговаÑ?а на додеÑ?ен задаÑ?ак."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
-msgstr "Ð?дговоÑ? на задÑ?жеÑ?е"
+msgstr "Ð?дговоÑ? на задаÑ?ак"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> оÑ?каза задÑ?жеÑ?е."
+msgstr "<b>%s</b> оÑ?казÑ?Ñ?е задаÑ?ак."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
-msgstr "Ð?Ñ?казиваÑ?е задÑ?жеÑ?а"
+msgstr "Ð?Ñ?казиваÑ?е задаÑ?ка"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
-msgstr "Ð?оÑ?а поÑ?Ñ?ка о задÑ?жеÑ?Ñ?"
+msgstr "Ð?оÑ?а поÑ?Ñ?ка о задаÑ?кÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> обÑ?ави Ñ?лободно/заÑ?зеÑ?о вÑ?еме."
+msgstr "<b>%s</b> обÑ?авÑ?Ñ?Ñ?е Ñ?лободно/заÑ?зеÑ?о вÑ?еме."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Слободно/заÑ?зеÑ?о вÑ?еме"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> пиÑ?а када Ñ?Ñ?е Ñ?лободни/заÑ?зеÑ?и."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Слободно/заÑ?зеÑ?о заÑ?Ñ?ев"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> одговоÑ?и на Ñ?лободно/заÑ?зеÑ?о заÑ?Ñ?ев."
+msgstr "<b>%s</b> одговаÑ?а на Ñ?лободно/заÑ?зеÑ?о заÑ?Ñ?ев."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Слободно/заÑ?зеÑ?о одговоÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Ð?оÑ?а Ñ?лободно/заÑ?зеÑ?о поÑ?Ñ?ка"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
-msgstr "Ð?оÑ?Ñ?ка изгледа да ниÑ?е иÑ?пÑ?авно Ñ?аÑ?иÑ?ена"
+msgstr "Ð?згледа да поÑ?Ñ?ка ниÑ?е иÑ?пÑ?авно Ñ?аÑ?иÑ?ена"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Ð?оÑ?Ñ?ка Ñ?адÑ?жи Ñ?амо неподÑ?жане заÑ?Ñ?еве."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Ð?Ñ?илог не Ñ?адÑ?жи иÑ?пÑ?авнÑ? поÑ?Ñ?кÑ? за календаÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
-msgstr "Ð?Ñ?илог нема пÑ?едмеÑ?е календаÑ?а коÑ?и Ñ?е могÑ? пÑ?егледаÑ?и"
+msgstr "Ð?Ñ?илог нема Ñ?Ñ?авке календаÑ?а коÑ?и Ñ?е могÑ? пÑ?егледаÑ?и"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
-msgstr "Ð?Ñ?вежаваÑ?е завÑ?Ñ?ено\n"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е завÑ?Ñ?ено\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
-msgstr "Ð?бÑ?екаÑ? ниÑ?е иÑ?пÑ?аван и не може биÑ?и оÑ?вежен\n"
+msgstr "Ð?бÑ?екаÑ? ниÑ?е иÑ?пÑ?аван и не може биÑ?и ажÑ?Ñ?иÑ?ан\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ð?ваÑ? одговоÑ? ниÑ?е поÑ?лао пÑ?иÑ?Ñ?Ñ?ан Ñ?Ñ?еÑ?ник.  Ð?одаÑ?и га Ñ? пÑ?иÑ?Ñ?Ñ?не?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "СÑ?аÑ?е Ñ?Ñ?еÑ?ника ниÑ?е оÑ?вежено Ñ?еÑ? нема иÑ?пÑ?авано Ñ?Ñ?аÑ?е!\n"
+msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ника ниÑ?е ажÑ?Ñ?иÑ?ан Ñ?еÑ? нема иÑ?пÑ?аван Ñ?Ñ?аÑ?Ñ?Ñ?!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
-msgstr "Ð?Ñ?вежен Ñ?Ñ?аÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ника\n"
+msgstr "Ð?жÑ?Ñ?иÑ?ан Ñ?Ñ?аÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ника\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "СÑ?аÑ?е Ñ?Ñ?еÑ?ника ниÑ?е оÑ?вежено Ñ?еÑ? пÑ?едмеÑ? виÑ?е не поÑ?Ñ?оÑ?и"
+msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ника ниÑ?е оÑ?вежен Ñ?еÑ? Ñ?Ñ?авка виÑ?е не поÑ?Ñ?оÑ?и"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098
+#: ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
-msgstr "Ð?Ñ?едмеÑ? поÑ?лаÑ?!\n"
+msgstr "СÑ?авка поÑ?лаÑ?а!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
-msgstr "Ð?Ñ?едмеÑ? ниÑ?е могао биÑ?и поÑ?лаÑ?!\n"
+msgstr "СÑ?авка ниÑ?е могла биÑ?и поÑ?лаÑ?а!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Ð?забеÑ?иÑ?е Ñ?адÑ?Ñ?:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
-msgstr "Ð?Ñ?вежи"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Ð?Ñ?иÑ?ваÑ?и"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Ð?Ñ?иÑ?ваÑ?и Ñ?а Ñ?езеÑ?вом"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Ð?дбиÑ?"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Ð?оÑ?аÑ?и Ñ?лободно/заÑ?зеÑ?о подаÑ?ак"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Ð?Ñ?вежи Ñ?Ñ?аÑ?Ñ?Ñ? Ñ?аговоÑ?ника"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Ð?оÑ?аÑ?и наÑ?новиÑ?и подаÑ?ак"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr "Ð?ониÑ?Ñ?и"
+msgstr "Ð?Ñ?кажи"
 
 #: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
@@ -8325,6 +7001,10 @@ msgstr "УÑ?иÑ?аваÑ?е календаÑ?а"
 msgid "Loading calendar..."
 msgstr "УÑ?иÑ?аваÑ?е календаÑ?а..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Ð?Ñ?ганизаÑ?оÑ?:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Ð?оÑ?Ñ?ка Ñ?еÑ?веÑ?а:"
@@ -8345,78 +7025,87 @@ msgstr "Ð?огÑ?Ñ?и Ñ?Ñ?еÑ?ниÑ?и"
 msgid "Resources"
 msgstr "Ð?звоÑ?и"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "УÑ?еÑ?ниÑ?и"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84
+#: ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736
+#: ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Ð?оÑ?единаÑ?"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975
+#: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Ð?Ñ?Ñ?па"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88
+#: ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Ð?звоÑ?"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90
+#: ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Соба"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
-msgstr "Ð?еÑ?Ñ?о"
+msgstr "СÑ?олиÑ?а"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739
+#: ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Ð?бавезан Ñ?Ñ?еÑ?ник"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Ð?огÑ?Ñ?и Ñ?Ñ?еÑ?ник"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ð?е-Ñ?Ñ?еÑ?ник"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Ð?оÑ?Ñ?ебна Ñ?адÑ?а"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "УÑ?еÑ?ник"
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "У Ñ?окÑ?"
 
 # %B = full month name, %d = month day, %Y = full year.
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -8429,8 +7118,8 @@ msgstr "%A, %d %B , %Y."
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
@@ -8441,71 +7130,71 @@ msgstr "%a %d. %m. %Y."
 # %d = day of month, %Y = year (all digits).
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Ð?ан канÑ?елаÑ?иÑ?е"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ð?ема подаÑ?ка"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "УÑ?_еÑ?ниÑ?и..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "Ð?_пÑ?иÑ?е"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Ð?Ñ?икажи _Ñ?амо Ñ?адне Ñ?аÑ?е"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Ð?Ñ?икажи _Ñ?маÑ?ено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
-msgstr "_Ð?Ñ?вежи Ñ?лободно/заÑ?зеÑ?о"
+msgstr "_Ð?жÑ?Ñ?иÑ?аÑ? Ñ?лободно/заÑ?зеÑ?о"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_СамоизбоÑ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Све Ñ?Ñ?де и извоÑ?е"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Све _Ñ?Ñ?де и Ñ?едан извоÑ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_Ð?бавезне Ñ?Ñ?де"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Ð?бавезне Ñ?Ñ?де и _Ñ?едан извоÑ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_Ð?Ñ?еме поÑ?еÑ?ка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "Ð?Ñ?еме _завÑ?Ñ?еÑ?ка:"
 
@@ -8533,15 +7222,17 @@ msgstr "Ð?език"
 msgid "Member"
 msgstr "Члан"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_Ð?бÑ?иÑ?и изабÑ?ане белеÑ?ке"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е да додаÑ?е белеÑ?кÑ?"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754
+#: ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8550,37 +7241,38 @@ msgstr ""
 "Ð?Ñ?еÑ?ка на %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "УÑ?иÑ?аваÑ?е белеÑ?ки Ñ?е Ñ? Ñ?окÑ?"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ð?Ñ?ваÑ?аÑ?е белеÑ?ки Ñ?а %s Ñ?е Ñ? Ñ?окÑ?"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066
+#: ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Ð?Ñ?иÑ?аÑ?е изабÑ?аниÑ? обÑ?екаÑ?а..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
-msgstr "УÑ?иÑ?аваÑ?е задÑ?жеÑ?а"
+msgstr "УÑ?иÑ?аваÑ?е задаÑ?ака"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "Ð?Ñ?ваÑ?аÑ?е задÑ?жеÑ?а Ñ? %s"
+msgstr "Ð?Ñ?ваÑ?аÑ?е задаÑ?ака Ñ? %s"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
-msgstr "Ð?авÑ?Ñ?аваÑ?е задÑ?жеÑ?а..."
+msgstr "Ð?авÑ?Ñ?аваÑ?е задаÑ?ака..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Ð?збаÑ?иваÑ?е"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Ð?забеÑ?иÑ?е вÑ?еменÑ?кÑ? зонÑ?"
 
@@ -8589,128 +7281,114 @@ msgstr "Ð?забеÑ?иÑ?е вÑ?еменÑ?кÑ? зонÑ?"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376
+#: ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "Ð?Ñ?_илагоÑ?ен пÑ?еглед"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "СаÑ?Ñ?ваÑ? пÑ?илагоÑ?ен пÑ?ег_лед"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "Ð?дÑ?е_ди пÑ?егледе..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
-msgstr "УÑ?иÑ?аваÑ?е Ñ?аÑ?Ñ?анака Ñ?а %s"
+msgstr "УÑ?иÑ?аваÑ?е заказиваÑ?а Ñ?а %s"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
-msgstr "УÑ?иÑ?аваÑ?е задÑ?жеÑ?а Ñ?а %s"
+msgstr "УÑ?иÑ?аваÑ?е задаÑ?ака Ñ?а %s"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "УÑ?иÑ?аваÑ?е белеÑ?ки на %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Ð?Ñ?ваÑ?аÑ?е %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "Ð?Ñ?иÑ?аÑ?е"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Ð?пÑ?ил"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Ð?вгÑ?Ñ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Ð?еÑ?ембаÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "ФебÑ?Ñ?аÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Ð?анÑ?аÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Ð?Ñ?л"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Ð?Ñ?н"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Ð?аÑ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Ð?аÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Ð?овембаÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Ð?кÑ?обаÑ?"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"Ð?анÑ?аÑ?\n"
+"ФебÑ?Ñ?аÑ?\n"
+"Ð?аÑ?Ñ?\n"
+"Ð?пÑ?ил\n"
+"Ð?аÑ?\n"
+"Ð?Ñ?н\n"
+"Ð?Ñ?л\n"
+"Ð?вгÑ?Ñ?Ñ?\n"
+"СепÑ?ембаÑ?\n"
+"Ð?кÑ?обаÑ?\n"
+"Ð?овембаÑ?\n"
+"Ð?еÑ?ембаÑ?"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Ð?забеÑ?иÑ?е даÑ?Ñ?м"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "СепÑ?ембаÑ?"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Ð?забеÑ?и данаÑ?Ñ?и дан"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410
+#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Ð?Ñ?ганизаÑ?оÑ? моÑ?а биÑ?и одÑ?еÑ?ен."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Ð?аÑ?маÑ?е Ñ?едан Ñ?Ñ?еÑ?ник Ñ?е неопÑ?одан"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Ð?одаÑ?ак о догаÑ?аÑ?Ñ?"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637
+#: ../calendar/gui/itip-utils.c:784
 msgid "Task information"
-msgstr "Ð?одаÑ?ак о задÑ?жеÑ?Ñ?"
+msgstr "Ð?одаÑ?ак о задаÑ?кÑ?"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639
+#: ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
-msgstr "Ð?одаÑ?и о белеÑ?ки"
+msgstr "Ð?одаÑ?и о белеÑ?Ñ?и"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641
+#: ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Слободно/заÑ?зеÑ?о подаÑ?ак"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Ð?одаÑ?ак о календаÑ?Ñ?"
 
@@ -8718,7 +7396,7 @@ msgstr "Ð?одаÑ?ак о календаÑ?Ñ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Ð?Ñ?иÑ?ваÑ?ено"
@@ -8727,7 +7405,7 @@ msgstr "Ð?Ñ?иÑ?ваÑ?ено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Ð?Ñ?иÑ?ваÑ?ено Ñ? Ñ?езеÑ?вом"
@@ -8739,7 +7417,8 @@ msgstr "Ð?Ñ?иÑ?ваÑ?ено Ñ? Ñ?езеÑ?вом"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691
+#: ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Ð?дбиÑ?ено"
@@ -8748,7 +7427,7 @@ msgstr "Ð?дбиÑ?ено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Ð?елегиÑ?ано"
@@ -8756,7 +7435,7 @@ msgstr "Ð?елегиÑ?ано"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ð?Ñ?вежено"
@@ -8764,15 +7443,15 @@ msgstr "Ð?Ñ?вежено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
-msgstr "Ð?ониÑ?Ñ?и"
+msgstr "Ð?Ñ?кажи"
 
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Ð?Ñ?вежи"
@@ -8780,29 +7459,29 @@ msgstr "Ð?Ñ?вежи"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Ð?Ñ?оÑ?ив-пÑ?едлог"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободно/заÑ?зеÑ?о вÑ?еме (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "иÐ?алендаÑ? подаÑ?ак"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Ð?оÑ?аÑ?е биÑ?и Ñ?Ñ?еÑ?ник догаÑ?аÑ?а."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Ð?ови Ñ?пиÑ?ак белеÑ?ки"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8810,7 +7489,8 @@ msgstr[0] "%d белеÑ?ка"
 msgstr[1] "%d белеÑ?ке"
 msgstr[2] "%d белеÑ?ки"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562
+#: ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8818,403 +7498,391 @@ msgstr[0] ", %d изабÑ?ано"
 msgstr[1] "%d изабÑ?ана"
 msgstr[2] "%d изабÑ?аниÑ?"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
-msgstr "Ð?еÑ?Ñ?пела допÑ?на белеÑ?ки."
+msgstr "Ð?еÑ?Ñ?пела догÑ?адÑ?а белеÑ?ки."
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?пиÑ?ка белеÑ?ки â??%sâ?? за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?пиÑ?ка белеÑ?ки â??%sâ?? за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Ð?иÑ?едан календаÑ? ниÑ?е доÑ?Ñ?Ñ?пан за пÑ?авÑ?еÑ?е белеÑ?ки"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "Ð?иÑ?аÑ? извоÑ?а белеÑ?ки"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Ð?ова белеÑ?ка"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Ð?елеÑ?к_а"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Ð?апиÑ?и Ñ?еднÑ? новÑ? белеÑ?кÑ?"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Ð?ова деÑ?ена белеÑ?ка"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Ð?еÑ?ена белеÑ?ка"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Ð?апÑ?ави нобÑ? деÑ?енÑ? белеÑ?кÑ?"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Ð?ови Ñ?пиÑ?ак белеÑ?ки"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Спи_Ñ?ак белеÑ?ки"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "СаÑ?Ñ?ави нови Ñ?пиÑ?ак белеÑ?ки"
 
-#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405
+#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "ШÑ?ампаÑ? белеÑ?ке"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Ð?еÑ?Ñ?о и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли задÑ?жеÑ?а Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од Ð?волÑ?Ñ?иÑ?е 1."
-"Ñ?.\n"
+"Ð?еÑ?Ñ?о и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли задÑ?жеÑ?а Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од Ð?волÑ?Ñ?иÑ?е 1.Ñ?.\n"
 "\n"
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
 #: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Ð?еÑ?Ñ?о и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли календаÑ?а Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од Ð?волÑ?Ñ?иÑ?е "
-"1.Ñ?.\n"
+"Ð?еÑ?Ñ?о и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли календаÑ?а Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од Ð?волÑ?Ñ?иÑ?е 1.Ñ?.\n"
 "\n"
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Ð?иÑ?е могÑ?Ñ? пÑ?еноÑ? Ñ?Ñ?аÑ?иÑ? подеÑ?аваÑ?а из evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ð?иÑ?е могÑ?Ñ? пÑ?еноÑ? календаÑ?а â??%sâ??"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ð?иÑ?е могÑ?Ñ? пÑ?еноÑ? задÑ?жеÑ?а â??%sâ??"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Ð?апомене"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Ð?е"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Ð?о"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "УÑ?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "СÑ?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Че"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Ð?е"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "СÑ?"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
-msgstr "Ð?аказани Ñ?аÑ?Ñ?анак"
+msgstr "Ð?аказиваÑ?е"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
-msgstr "Ð?адÑ?жеÑ?е"
+msgstr "Ð?адаÑ?ак"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
-msgstr "Ð?Ñ?еглед: %s"
+msgstr "СажеÑ?ак: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "Ð?Ñ?иÑ?Ñ?Ñ?ни:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "СÑ?аÑ?Ñ?Ñ?: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Ð?ажноÑ?Ñ?: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Ð?оÑ?Ñ?оÑ?ак завÑ?Ñ?еног: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "Ð?дÑ?еÑ?а: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Ð?аÑ?егоÑ?иÑ?е: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Ð?онÑ?акÑ?и: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
-msgstr "Ð?о_ви Ñ?пиÑ?ак задÑ?жеÑ?а"
+msgstr "Ð?о_ви Ñ?пиÑ?ак задаÑ?ака"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d задÑ?жеÑ?е"
-msgstr[1] "%d задÑ?жеÑ?а"
-msgstr[2] "%d задÑ?жеÑ?а"
+msgstr[0] "%d задаÑ?ак"
+msgstr[1] "%d задаÑ?ака"
+msgstr[2] "%d задаÑ?ака"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
-msgstr "Ð?еÑ?Ñ?пела допÑ?на задÑ?жеÑ?а."
+msgstr "Ð?еÑ?Ñ?пела догÑ?адÑ?а задаÑ?ака."
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е лиÑ?Ñ?е задÑ?жеÑ?а â??%sâ?? за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?пиÑ?ка задаÑ?ака â??%sâ?? за пÑ?авÑ?еÑ?е догаÑ?аÑ?а и Ñ?аÑ?Ñ?анака"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
-msgstr "Ð?иÑ?едан календаÑ? ниÑ?е доÑ?Ñ?Ñ?пан за пÑ?авÑ?еÑ?е задÑ?жеÑ?а"
+msgstr "Ð?иÑ?едан календаÑ? ниÑ?е доÑ?Ñ?Ñ?пан за пÑ?авÑ?еÑ?е задаÑ?ака"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
-msgstr "Ð?иÑ?аÑ? извоÑ?а задÑ?жеÑ?а"
+msgstr "Ð?иÑ?аÑ? извоÑ?а задаÑ?ака"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
-msgstr "Ð?ово задÑ?жеÑ?е"
+msgstr "Ð?ови задаÑ?ак"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
-msgstr "_Ð?адÑ?жеÑ?е"
+msgstr "_Ð?адаÑ?ак"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
-msgstr "Ð?апÑ?ави ново задÑ?жеÑ?е"
+msgstr "Ð?апÑ?ави нови задаÑ?ак"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
-msgstr "Ð?ово додеÑ?ено задÑ?жеÑ?е"
+msgstr "Ð?ови додеÑ?ени задаÑ?ак"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "Ð?одеÑ?ен_о задÑ?жеÑ?е"
+msgstr "Ð?одеÑ?ен_и задаÑ?ак"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
-msgstr "Ð?одели ново задÑ?жеÑ?е"
+msgstr "Ð?одели нови задаÑ?ак"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
-msgstr "Ð?ова лиÑ?Ñ?а задÑ?жеÑ?а"
+msgstr "Ð?ови Ñ?пиÑ?ак задаÑ?ака"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
-msgstr "Ð?иÑ?Ñ?а задÑ?ж_еÑ?а"
+msgstr "СпиÑ?ак зада_Ñ?ака"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
-msgstr "СаÑ?Ñ?ави новÑ? лиÑ?Ñ?Ñ? задÑ?жеÑ?а"
+msgstr "Ð?апÑ?ави нови Ñ?пиÑ?ак задаÑ?ака"
 
-#: ../calendar/gui/tasks-control.c:488
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ð?ва опеÑ?аÑ?иÑ?а Ñ?е Ñ?Ñ?аÑ?но обÑ?иÑ?аÑ?и Ñ?ва задÑ?жеÑ?а обележена као завÑ?Ñ?ена. Ð?ко "
-"наÑ?Ñ?авиÑ?е, неÑ?еÑ?е моÑ?и да повÑ?аÑ?иÑ?е ова задÑ?жеÑ?а.\n"
+"Ð?ва опеÑ?аÑ?иÑ?а Ñ?е Ñ?Ñ?аÑ?но обÑ?иÑ?аÑ?и Ñ?ве задаÑ?ке обележене као завÑ?Ñ?ене. Ð?ко наÑ?Ñ?авиÑ?е, неÑ?еÑ?е моÑ?и да повÑ?аÑ?иÑ?е ове задаÑ?ке.\n"
 "\n"
-"Ð?аиÑ?Ñ?а обÑ?иÑ?аÑ?и ова задÑ?жеÑ?а?"
+"Ð?аиÑ?Ñ?а обÑ?иÑ?аÑ?и ове задаÑ?ке?"
 
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ð?е пиÑ?аÑ? ме поново."
 
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
+#: ../calendar/gui/tasks-control.c:524
+#: ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
-msgstr "ШÑ?ампаÑ? задÑ?жеÑ?а"
+msgstr "ШÑ?ампаÑ? задаÑ?ке"
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
@@ -9229,11 +7897,13 @@ msgstr "Ð?Ñ?казано"
 msgid "In progress"
 msgstr "У Ñ?окÑ?"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "Ñ?е веÑ?е од"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "Ñ?е маÑ?е од"
 
@@ -9241,37 +7911,37 @@ msgstr "Ñ?е маÑ?е од"
 msgid "Appointments and Meetings"
 msgstr "Ð?аказиваÑ?е и Ñ?аÑ?Ñ?анÑ?и"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Ð?Ñ?ваÑ?аÑ?е календаÑ?а"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "иÐ?алендаÑ? даÑ?оÑ?еке (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Ð?волÑ?Ñ?иÑ?а иÐ?алендаÑ? Ñ?возник"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Ð?одÑ?еÑ?ник!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "вÐ?алендаÑ? даÑ?оÑ?еке (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Ð?волÑ?Ñ?иÑ?а вÐ?алендаÑ? Ñ?возник"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Ð?алендаÑ?Ñ?ки догаÑ?аÑ?и"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Ð?волÑ?Ñ?иÑ?а календаÑ? инÑ?елигенÑ?ни Ñ?возник"
 
@@ -10826,263 +9496,261 @@ msgstr "Ð?аÑ?иÑ?ик/Ð?олиÑ?"
 msgid "Pacific/Yap"
 msgstr "Ð?аÑ?иÑ?ик/Ð?ап"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и аÑ?Ñ?омаÑ?Ñ?ки Ñ?аÑ?Ñ?ванÑ? даÑ?оÑ?екÑ?"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "Ð?иÑ?е могÑ?Ñ?е вÑ?аÑ?иÑ?и поÑ?Ñ?кÑ? из Ñ?Ñ?еÑ?иваÑ?а"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "УмеÑ?ни пÑ?илог"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "Ð?Ñ?и_ложи"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "Ð?еименована поÑ?Ñ?ка"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
-msgstr "Ð?Ñ?иложи даÑ?оÑ?екÑ?"
+msgstr "Ð?Ñ?илаже даÑ?оÑ?екÑ?"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322
+#: ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Ð?аÑ?воÑ?и"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
-msgstr "Ð?аÑ?воÑ?и Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
+msgstr "Ð?аÑ?ваÑ?а Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../composer/e-composer-actions.c:329
+#: ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58
+#: ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ШÑ?ам_паÑ?..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:336
+#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Ð?Ñ?е_глед пÑ?ед Ñ?Ñ?ампÑ?"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
-msgstr "СаÑ?Ñ?ваÑ? Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
+msgstr "ЧÑ?ва Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "СаÑ?Ñ?ваÑ? _као..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
-msgstr "СаÑ?Ñ?ваÑ? Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ? под дÑ?Ñ?гим именом"
+msgstr "ЧÑ?ва Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ? под дÑ?Ñ?гим именом"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
-msgstr "СаÑ?Ñ?ваÑ? као п_Ñ?ипÑ?емÑ?"
+msgstr "СаÑ?Ñ?ваÑ? као _наÑ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
-msgstr "СаÑ?Ñ?ваÑ? као пÑ?ипÑ?емÑ?"
+msgstr "ЧÑ?ва као наÑ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "Ð?оÑ?_аÑ?и"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
-msgstr "Ð?оÑ?аÑ?и овÑ? поÑ?Ñ?кÑ?"
+msgstr "ШаÑ?е овÑ? поÑ?Ñ?кÑ?"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
-msgstr "УмеÑ?ни опÑ?иÑ?е Ñ?лаÑ?а"
+msgstr "УмеÑ?е опÑ?иÑ?е Ñ?лаÑ?а"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "Ð?ова _поÑ?Ñ?ка"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Ð?Ñ?ваÑ?а пÑ?озоÑ? за новÑ? поÑ?Ñ?кÑ?"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "Ð?о_дна Ñ?Ñ?Ñ?ана"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "_СигÑ?Ñ?ноÑ?Ñ?"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP _Ñ?иÑ?Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
-msgstr "ШиÑ?Ñ?Ñ?Ñ? овÑ? поÑ?Ñ?кÑ? помоÑ?Ñ? PGP-а"
+msgstr "ШиÑ?Ñ?Ñ?Ñ?е овÑ? поÑ?Ñ?кÑ? помоÑ?Ñ? PGP-а"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP _поÑ?пиÑ?и"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
-msgstr "Ð?оÑ?пиÑ?и овÑ? поÑ?Ñ?кÑ? помоÑ?Ñ? PGP кÑ?Ñ?Ñ?а"
+msgstr "Ð?оÑ?пиÑ?Ñ?Ñ?е овÑ? поÑ?Ñ?кÑ? помоÑ?Ñ? PGP кÑ?Ñ?Ñ?а"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
-msgstr "Ð?_ажноÑ?Ñ?и поÑ?Ñ?ке"
+msgstr "Ð?_ажноÑ?Ñ? поÑ?Ñ?ке"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
-msgstr "Ð?оÑ?Ñ?ави важноÑ?Ñ? поÑ?Ñ?ке на виÑ?око"
+msgstr "Ð?оÑ?Ñ?авÑ?а важноÑ?Ñ? поÑ?Ñ?ке на виÑ?око"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
-msgstr "Т_Ñ?ажи пÑ?изнаниÑ?Ñ?"
+msgstr "Т_Ñ?ажи повÑ?аÑ?ниÑ?Ñ?"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
-msgstr "Ð?Ñ?ими извеÑ?Ñ?аÑ? о доÑ?Ñ?ави када Ñ?е ваÑ?а поÑ?Ñ?ка пÑ?оÑ?иÑ?ана"
+msgstr "Ð?Ñ?има извеÑ?Ñ?аÑ? о доÑ?Ñ?ави када Ñ?е поÑ?Ñ?ка пÑ?оÑ?иÑ?ана"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _Ñ?иÑ?Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "ШиÑ?Ñ?Ñ?Ñ? овÑ? поÑ?Ñ?кÑ? помоÑ?Ñ? S/MIME Ñ?еÑ?Ñ?иÑ?икаÑ?а за Ñ?иÑ?Ñ?оваÑ?е"
+msgstr "ШиÑ?Ñ?Ñ?Ñ?е овÑ? поÑ?Ñ?кÑ? помоÑ?Ñ? S/MIME Ñ?еÑ?Ñ?иÑ?икаÑ?а за Ñ?иÑ?Ñ?оваÑ?е"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _поÑ?пиÑ?и"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Ð?оÑ?пиÑ?и овÑ? поÑ?Ñ?кÑ? S/MIME Ñ?еÑ?Ñ?иÑ?икаÑ?ом"
+msgstr "Ð?оÑ?пиÑ?Ñ?Ñ?е овÑ? поÑ?Ñ?кÑ? S/MIME Ñ?еÑ?Ñ?иÑ?икаÑ?ом"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_Bcc поÑ?е"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е BCC пÑ?иказано"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Cc поÑ?е"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е CC пÑ?иказано"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "Ш_аÑ?е поÑ?е"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е ШаÑ?е пÑ?иказано"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "_Ð?оÑ?аÑ?и поÑ?е"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Ð?оÑ?аÑ?и пÑ?иказано"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
-msgstr "Ð?дго_воÑ? поÑ?е"
+msgstr "Ð?дго_воÑ?-за поÑ?е"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Ð?дговоÑ? пÑ?иказано"
+msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Ð?дговоÑ?-за пÑ?иказано"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "Ð?оÑ?е за _Ñ?емÑ?"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Ð?иÑ?а да ли да пÑ?икаже поÑ?е за Ñ?емÑ?"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "_Ð?Ñ?има поÑ?е"
+#: ../composer/e-composer-actions.c:521
+msgid "Save Draft"
+msgstr "СаÑ?Ñ?ваÑ? наÑ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Ð?Ñ?има пÑ?иказано"
+#: ../composer/e-composer-header.c:120
+#| msgid "Sho_w: "
+msgid "Show"
+msgstr "Ð?Ñ?икажи "
 
-#: ../composer/e-composer-actions.c:699
-msgid "Save Draft"
-msgstr "СаÑ?Ñ?ваÑ? пÑ?ипÑ?емÑ?"
+#: ../composer/e-composer-header.c:123
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "СакÑ?иÑ?"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "УнеÑ?иÑ?е пÑ?имаоÑ?е поÑ?Ñ?ке"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "УнеÑ?иÑ?е адÑ?еÑ?е коÑ?е Ñ?е пÑ?имиÑ?и копиÑ?Ñ? (cc) поÑ?Ñ?ке"
 
-#: ../composer/e-composer-header-table.c:69
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-"УнеÑ?иÑ?е адÑ?еÑ?е коÑ?е Ñ?е пÑ?имиÑ?и копиÑ?Ñ? поÑ?Ñ?ке без поÑ?авÑ?иваÑ?а Ñ? лиÑ?Ñ?и "
-"пÑ?ималаÑ?а поÑ?Ñ?ке"
+#: ../composer/e-composer-header-table.c:46
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "УнеÑ?иÑ?е адÑ?еÑ?е коÑ?е Ñ?е пÑ?имиÑ?и копиÑ?Ñ? поÑ?Ñ?ке без поÑ?авÑ?иваÑ?а Ñ? лиÑ?Ñ?и пÑ?ималаÑ?а поÑ?Ñ?ке"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "Ш_аÑ?е:"
 
+#: ../composer/e-composer-header-table.c:945
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923
+#: ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "ШаÑ?е"
+
 # *
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
-msgstr "_Ð?дговоÑ?:"
+msgstr "_Ð?дговоÑ?-за:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "_Ð?Ñ?има:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Ð?опиÑ?а (Cc):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Ð?евидÑ?ива копиÑ?а (Bcc):"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "С_лаÑ?е на:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "Ð?а_Ñ?лов:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "Ð?оÑ?п_иÑ?:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
-msgstr "Ð?ликниÑ?е овде за именик."
+msgstr "Ð?ликниÑ?е овде за адÑ?еÑ?аÑ?."
 
 #: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
@@ -11096,65 +9764,38 @@ msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?икле за Ñ?лаÑ?е поÑ?Ñ?ке."
 msgid "Click here to select folders to post to"
 msgstr "Ð?ликниÑ?е овде да изабеÑ?еÑ?е Ñ?аÑ?Ñ?икле за Ñ?лаÑ?е"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "Ð?Ñ?икажи лини_Ñ?Ñ? пÑ?илога"
+#: ../composer/e-composer-private.c:208
+#| msgid "Save Draft"
+msgid "Save draft"
+msgstr "СаÑ?Ñ?ваÑ? наÑ?Ñ?Ñ?"
 
-#: ../composer/e-msg-composer.c:866
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е поÑ?пиÑ?иваÑ?е одлазеÑ?е поÑ?Ñ?ке: ниÑ?е поÑ?Ñ?авÑ?ен Ñ?еÑ?Ñ?иÑ?икаÑ? за "
-"поÑ?пиÑ?иваÑ?е за оваÑ? налог"
+#: ../composer/e-msg-composer.c:807
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Ð?иÑ?е могÑ?Ñ?е поÑ?пиÑ?иваÑ?е одлазеÑ?е поÑ?Ñ?ке: ниÑ?е поÑ?Ñ?авÑ?ен Ñ?еÑ?Ñ?иÑ?икаÑ? за поÑ?пиÑ?иваÑ?е за оваÑ? налог"
 
-#: ../composer/e-msg-composer.c:873
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?Ñ?оваÑ?е одлазеÑ?е поÑ?Ñ?ке: ниÑ?е поÑ?Ñ?авÑ?ен Ñ?еÑ?Ñ?иÑ?икаÑ? за "
-"Ñ?иÑ?Ñ?оваÑ?е за оваÑ? налог"
+#: ../composer/e-msg-composer.c:814
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?Ñ?оваÑ?е одлазеÑ?е поÑ?Ñ?ке: ниÑ?е поÑ?Ñ?авÑ?ен Ñ?еÑ?Ñ?иÑ?икаÑ? за Ñ?иÑ?Ñ?оваÑ?е за оваÑ? налог"
 
-#: ../composer/e-msg-composer.c:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Ð?Ñ?илог"
-msgstr[1] "Ð?Ñ?илози"
-msgstr[2] "Ð?Ñ?илога"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "СакÑ?иÑ? ли_ниÑ?Ñ? пÑ?илога"
-
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1350
+#: ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "СаÑ?Ñ?ави поÑ?Ñ?кÑ?"
 
-#: ../composer/e-msg-composer.c:4095
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(СаÑ?Ñ?авÑ?аÑ? Ñ? Ñ?елÑ? поÑ?Ñ?ке не Ñ?адÑ?жи Ñ?екÑ?Ñ?, Ñ?Ñ?о не може биÑ?и измеÑ?ено.)<b>"
+#: ../composer/e-msg-composer.c:3347
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(СаÑ?Ñ?авÑ?аÑ? Ñ? Ñ?елÑ? поÑ?Ñ?ке не Ñ?адÑ?жи Ñ?екÑ?Ñ?, Ñ?Ñ?о не може биÑ?и измеÑ?ено.)<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Ð?Ñ?еÑ?зима Ñ?е неколико пÑ?илога. Уколико Ñ?ада поÑ?аÑ?еÑ?е поÑ?Ñ?кÑ? ови пÑ?илози неÑ?е "
-"биÑ?и поÑ?лаÑ?и Ñ?а Ñ?ом "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr " Ð?Ñ?еÑ?зима Ñ?е неколико пÑ?илога. Уколико Ñ?ада поÑ?аÑ?еÑ?е поÑ?Ñ?кÑ? ови пÑ?илози неÑ?е биÑ?и поÑ?лаÑ?и Ñ?а Ñ?ом "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Сви налози Ñ?Ñ? Ñ?клоÑ?ени."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "СигÑ?Ñ?но желиÑ?е да одбаÑ?иÑ?е поÑ?Ñ?кÑ?, наÑ?ловÑ?енÑ? â??{0}â??, коÑ?Ñ? Ñ?аÑ?Ñ?авÑ?аÑ?е?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -11171,14 +9812,8 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Ð?бог &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Ð?аÑ?ваÑ?аÑ?ем овог пÑ?озоÑ?а за Ñ?аÑ?Ñ?авÑ?аÑ?е Ñ?еÑ?е Ñ?Ñ?аÑ?но одбаÑ?иÑ?и поÑ?Ñ?кÑ?, оÑ?им ако "
-"одлÑ?Ñ?иÑ?е да Ñ?аÑ?Ñ?ваÑ?е поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? Ð?Ñ?ипÑ?ема. Ð?во Ñ?е Ð?ам омогÑ?Ñ?иÑ?и да "
-"наÑ?Ñ?авиÑ?е поÑ?Ñ?кÑ? каÑ?ниÑ?е."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Ð?аÑ?ваÑ?аÑ?ем овог пÑ?озоÑ?а за Ñ?аÑ?Ñ?авÑ?аÑ?е Ñ?еÑ?е Ñ?Ñ?аÑ?но одбаÑ?иÑ?и поÑ?Ñ?кÑ?, оÑ?им ако одлÑ?Ñ?иÑ?е да Ñ?аÑ?Ñ?ваÑ?е поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?икли Ð?аÑ?Ñ?Ñ?и. Ð?во Ñ?е омогÑ?Ñ?иÑ?и да наÑ?Ñ?авиÑ?е поÑ?Ñ?кÑ? каÑ?ниÑ?е."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
@@ -11218,20 +9853,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Ð?Ñ?еÑ?ка Ñ? Ñ?Ñ?ваÑ?Ñ? Ñ?амоÑ?Ñ?ваÑ?Ñ?Ñ?е даÑ?оÑ?еке због &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Ð?волÑ?Ñ?иÑ?а Ñ?е неоÑ?екивано завÑ?Ñ?ила Ñ?оком пиÑ?аÑ?а нове поÑ?Ñ?ке. СпаÑ?аваÑ?е поÑ?Ñ?ке "
-"Ñ?е Ð?ам омогÑ?Ñ?иÑ?и да наÑ?Ñ?авиÑ?е где Ñ?Ñ?е Ñ?Ñ?али."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?е неоÑ?екивано завÑ?Ñ?ила Ñ?оком пиÑ?аÑ?а нове поÑ?Ñ?ке. СпаÑ?аваÑ?е поÑ?Ñ?ке Ñ?е омогÑ?Ñ?иÑ?и да наÑ?Ñ?авиÑ?е где Ñ?Ñ?е Ñ?Ñ?али."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"Ð?пÑ?иÑ?е Ñ?лаÑ?а Ñ?Ñ? доÑ?Ñ?Ñ?пне Ñ?амо за Novell GroupWise и Microsoft Exchange "
-"налоге."
+msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
+msgstr "Ð?пÑ?иÑ?е Ñ?лаÑ?а Ñ?Ñ? доÑ?Ñ?Ñ?пне Ñ?амо за Novell GroupWise и Microsoft Exchange налоге."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11242,19 +9869,14 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Ð?аÑ?оÑ?ека â??{0}â?? ниÑ?е Ñ?егÑ?лаÑ?на и не може биÑ?и поÑ?лаÑ?а Ñ? поÑ?Ñ?Ñ?и."
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"Ð?а пÑ?иложиÑ?е Ñ?адÑ?жаÑ? овог диÑ?екÑ?оÑ?иÑ?Ñ?ма, или пÑ?иложиÑ?е Ñ?ве даÑ?оÑ?еке из Ñ?ега "
-"поÑ?единаÑ?но, или напÑ?авиÑ?е аÑ?Ñ?ивÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ма и пÑ?иложиÑ?е Ñ?е."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "Ð?а пÑ?иложиÑ?е Ñ?адÑ?жаÑ? овог диÑ?екÑ?оÑ?иÑ?Ñ?ма, или пÑ?иложиÑ?е Ñ?ве даÑ?оÑ?еке из Ñ?ега поÑ?единаÑ?но, или напÑ?авиÑ?е аÑ?Ñ?ивÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ма и пÑ?иложиÑ?е Ñ?е."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "Ð?иÑ?е могÑ?Ñ?е покÑ?еÑ?аÑ?е конÑ?Ñ?оле HTML Ñ?Ñ?еÑ?иваÑ?а.\n"
 "\n"
@@ -11294,36 +9916,84 @@ msgstr "Спа_Ñ?и"
 
 #: ../composer/mail-composer.error.xml.h:33
 msgid "_Save Draft"
-msgstr "_СаÑ?Ñ?ваÑ? пÑ?ипÑ?емÑ?"
+msgstr "_СаÑ?Ñ?ваÑ? наÑ?Ñ?Ñ?"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
-msgstr "Ð?волÑ?Ñ?иÑ?ина поÑ?Ñ?а и календаÑ?"
+msgstr "Ð?оÑ?Ñ?а и календаÑ? Ð?волÑ?Ñ?иÑ?е"
 
 # bug(slobo): tooltip би могао да бÑ?де и â??Ð?оÑ?аÑ?иÑ?е е-поÑ?Ñ?кÑ? пÑ?иÑ?аÑ?еÑ?има и поÑ?ед
 # овако Ñ?Ñ?Ñ?огÑ?ениÑ? оÑ?игинала
 # msgstr "Ð?акеÑ? поÑ?ловниÑ? пÑ?огÑ?ама"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2
+#: ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
-msgstr "Ð?oÑ?аÑ?иÑ?е елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?Ñ? пÑ?иÑ?аÑ?еÑ?има и поÑ?ловним Ñ?аÑ?адниÑ?има"
+msgstr "Ð?акеÑ? Groupware"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "Manage your email, contacts and schedule"
-msgstr "УпÑ?авÑ?аÑ?Ñ?е поÑ?Ñ?ом, конÑ?акÑ?има и заказиваÑ?има"
+msgstr "УпÑ?авÑ?а поÑ?Ñ?ом, конÑ?акÑ?има и обавезама"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
-msgstr "каÑ?Ñ?а именика"
+msgstr "каÑ?Ñ?а адÑ?еÑ?аÑ?а"
 
 #: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "подаÑ?ак календаÑ?а"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Ð?анаÑ?"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200
+#: ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "СÑ?Ñ?Ñ?а"
+
+#: ../e-util/e-datetime-format.c:202
+#| msgid "Yesterday %l:%M %p"
+msgid "Yesterday"
+msgstr "Ð?Ñ?Ñ?е"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr "%d дана од Ñ?ада"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+#| msgid "1 day ago"
+#| msgid_plural "%d days ago"
+msgid "%d days ago"
+msgstr "пÑ?е %d дана"
+
+#: ../e-util/e-datetime-format.c:281
+#: ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+#| msgid "_Use system defaults"
+msgid "Use locale default"
+msgstr "Ð?оÑ?иÑ?Ñ?и подÑ?азÑ?меван локалиÑ?еÑ?"
+
+#: ../e-util/e-datetime-format.c:494
+#| msgid "Format"
+msgid "Format:"
+msgstr "ФоÑ?маÑ?:"
+
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Ð?Ñ?еÑ?ка Ð?волÑ?Ñ?иÑ?е"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:81
+#: ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "УпозоÑ?еÑ?е Ð?волÑ?Ñ?иÑ?е"
 
@@ -11337,7 +10007,7 @@ msgstr "УпиÑ? Ð?волÑ?Ñ?иÑ?е"
 
 # bug(slobo): могли Ñ?Ñ? даÑ?и и боÑ?и оÑ?игинал, добили Ñ?Ñ? иÑ?Ñ?о Ñ?ако Ñ?миÑ?лен пÑ?евод
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "УнÑ?Ñ?Ñ?аÑ?Ñ?а гÑ?еÑ?ка, заÑ?Ñ?евана Ñ?е непознаÑ?а гÑ?еÑ?ка â??%sâ??"
@@ -11350,70 +10020,74 @@ msgstr "Ð?омпоненÑ?а"
 msgid "Name of the component being logged"
 msgstr "Ð?азив компоненÑ?е коÑ?и Ñ?е бележи"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Ð?невниÑ?и диÑ?агнозе кваÑ?а"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
-msgstr "Ð?Ñ?икажи Ñ? Ñ?Ñ?аÑ?Ñ?Ñ?ноÑ? линиÑ?и _гÑ?еÑ?ке за"
+msgstr "Ð?Ñ?икажи Ñ? Ñ?Ñ?аÑ?и Ñ?Ñ?аÑ?Ñ?Ñ?а _гÑ?еÑ?ке за"
 
 # bug: plural-forms
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "Ñ?екÑ?нд(е)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "УноÑ?и дневника:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "Ð?иво запиÑ?иваÑ?а Ñ? дневник"
 
 # note(slobo): можда Ñ?Ñ?еба Ñ?ок
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Ð?Ñ?еме"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292
+#: ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Ð?оÑ?Ñ?ке"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Ð?аÑ?воÑ?и оваÑ? пÑ?озоÑ?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Ð?Ñ?еÑ?ка"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Ð?Ñ?еÑ?ке"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "УпозоÑ?еÑ?а и гÑ?еÑ?ке"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Ð?иÑ?агноза кваÑ?а"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Ð?оÑ?Ñ?ке о гÑ?еÑ?Ñ?и, Ñ?позоÑ?еÑ?Ñ? и диÑ?агнози кваÑ?а"
 
 # has "activatable" set.
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308
+#: ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477
+#: ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "Ð?могÑ?Ñ?ено"
 
@@ -11430,22 +10104,26 @@ msgid "The printing system reported the following details about the error:"
 msgstr "СиÑ?Ñ?ем за Ñ?Ñ?ампаÑ?е Ñ?е извеÑ?Ñ?ио Ñ?ледеÑ?е деÑ?аÑ?е о гÑ?еÑ?ки:"
 
 #: ../e-util/e-print.c:173
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "СиÑ?Ñ?ем за Ñ?Ñ?ампаÑ?е ниÑ?е понÑ?дио никакве додаÑ?не деÑ?аÑ?е о гÑ?еÑ?ки."
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?аÑ?Ñ?авÑ?ено"
+
 # mail-composer:no-sig-file secondary
 # mail:no-create-tmp-path secondary
 # mail:no-delete-folder secondary
 # system:no-save-file secondary
 # system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 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}\"."
@@ -11463,24 +10141,25 @@ msgstr "Ð?аÑ?оÑ?ека поÑ?Ñ?оÑ?и â??{0}â??."
 msgid "Overwrite file?"
 msgstr "Ð?Ñ?епиÑ?аÑ?и даÑ?оÑ?екÑ??"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Ð?Ñ?епиÑ?и"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
-msgstr "Ð?е могÑ? да оÑ?воÑ?им везÑ?."
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и везÑ?."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
-msgstr "Ð?е могÑ? да пÑ?икажем Ð?волÑ?Ñ?иÑ?инÑ? помоÑ?."
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?иказаÑ?и помоÑ? за Ð?волÑ?Ñ?иÑ?Ñ?."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "Ð?аж_но"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "Ð?о_Ñ?ао"
 
@@ -11488,52 +10167,50 @@ msgstr "Ð?о_Ñ?ао"
 # Create the default Person task list
 # orange
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "Ð?_иÑ?но"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "Ð?а Ñ?Ñ?ади_Ñ?и"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "Ð?аÑ?ни_Ñ?е"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "Ð?азив _ознаке:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "УÑ?еди ознакÑ?"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "Ð?одаÑ? ознакÑ?"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "Ð?знака не може биÑ?и без назива."
 
-#: ../e-util/e-util-labels.c:362
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
+#: ../e-util/e-util-labels.c:367
+msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "Ð?знака иÑ?Ñ?ога назива веÑ? поÑ?Ñ?оÑ?и на Ñ?еÑ?веÑ?Ñ?. Ð?Ñ?омениÑ?е име ознаÑ?и."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf гÑ?еÑ?ка: %s"
 
-#: ../e-util/gconf-bridge.c:1232
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Све гÑ?еÑ?ке Ñ?е Ñ?бÑ?дÑ?Ñ?е пÑ?иказÑ?Ñ?Ñ? Ñ?амо Ñ? Ñ?еÑ?миналÑ?."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11541,7 +10218,7 @@ msgstr[0] "пÑ?е %d Ñ?екÑ?нде"
 msgstr[1] "пÑ?е %d Ñ?екÑ?нде"
 msgstr[2] "пÑ?е %d Ñ?екÑ?нди"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -11549,7 +10226,7 @@ msgstr[0] "%d Ñ?екÑ?нда Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d Ñ?екÑ?нде Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[2] "%d Ñ?екÑ?нди Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11557,7 +10234,7 @@ msgstr[0] "пÑ?е %d минÑ?Ñ?"
 msgstr[1] "пÑ?е %d минÑ?Ñ?а"
 msgstr[2] "пÑ?е %d минÑ?Ñ?а"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -11565,7 +10242,7 @@ msgstr[0] "%d минÑ?Ñ? Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d минÑ?Ñ?а Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[2] "%d минÑ?Ñ?а Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11573,7 +10250,7 @@ msgstr[0] "пÑ?е %d Ñ?аÑ?"
 msgstr[1] "пÑ?е %d Ñ?аÑ?а"
 msgstr[2] "пÑ?е %d Ñ?аÑ?и"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -11581,7 +10258,7 @@ msgstr[0] "%d Ñ?аÑ? Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d Ñ?аÑ?а Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[2] "%d Ñ?аÑ?и Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11589,7 +10266,7 @@ msgstr[0] "пÑ?е %d дан"
 msgstr[1] "пÑ?е %d дана"
 msgstr[2] "пÑ?е %d дана"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -11597,7 +10274,7 @@ msgstr[0] "%d дан Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d дана Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[2] "%d дана Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11605,7 +10282,7 @@ msgstr[0] "пÑ?е %d недеÑ?Ñ?"
 msgstr[1] "пÑ?е %d недеÑ?е"
 msgstr[2] "пÑ?е %d недеÑ?а"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -11613,7 +10290,7 @@ msgstr[0] "%d недеÑ?а Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d недеÑ?е Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[2] "%d недеÑ?а Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11621,7 +10298,7 @@ msgstr[0] "пÑ?е %d меÑ?еÑ?"
 msgstr[1] "пÑ?е %d меÑ?еÑ?а"
 msgstr[2] "пÑ?е %d меÑ?еÑ?и"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -11629,7 +10306,7 @@ msgstr[0] "%d меÑ?еÑ? Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11637,7 +10314,7 @@ msgstr[0] "пÑ?е %d годинÑ?"
 msgstr[1] "пÑ?е %d године"
 msgstr[2] "пÑ?е %d година"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -11645,83 +10322,86 @@ msgstr[0] "%d година Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[1] "%d године Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 msgstr[2] "%d година Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<кликниÑ?е овде да изабеÑ?еÑ?е даÑ?Ñ?м>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "Ñ?ада"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Ð?забеÑ?иÑ?е вÑ?еме за поÑ?еÑ?еÑ?е"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ?"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Ð?Ñ?оба"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "Ð?ме п_Ñ?авила:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "Ð?Ñ?онаÑ?и Ñ?Ñ?авке коÑ?е задовоÑ?аваÑ?Ñ? Ñ?ледеÑ?е Ñ?Ñ?лове"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "Ð?одаÑ? _Ñ?Ñ?лов"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "Ð?ко Ñ?Ñ? Ñ?ви Ñ?Ñ?лови задовоÑ?ени"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "Ð?ко Ñ?е било коÑ?и Ñ?Ñ?лов задовоÑ?ен"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
-msgstr "_Ð?Ñ?онаÑ?и пÑ?едмеÑ?е:"
+msgstr "_Ð?Ñ?онаÑ?и Ñ?Ñ?авке:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "Ð?дговоÑ?и"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "Ð?дговоÑ?и и надÑ?еÑ?ено"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "Ð?ема одговоÑ?а или Ñ?одиÑ?еÑ?а"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "У_кÑ?Ñ?Ñ?и ниÑ?и"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Ð?олазно"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038
+#: ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Ð?длазно"
 
@@ -11746,7 +10426,8 @@ msgid "Missing file name."
 msgstr "Ð?едоÑ?Ñ?аÑ?е име даÑ?оÑ?еке."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Ð?едоÑ?Ñ?аÑ?е име."
 
@@ -11808,55 +10489,52 @@ msgstr ""
 "Ñ?Ñ?енÑ?Ñ?ним вÑ?еменом када Ñ?е Ñ?илÑ?Ñ?иÑ?аÑ?е деÑ?ило."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "вÑ?еме Ñ? одноÑ?Ñ? на Ñ?Ñ?енÑ?Ñ?но вÑ?еме"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "пÑ?е"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "меÑ?еÑ?и"
-
-# bug: plural-forms
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "Ñ?екÑ?нде"
+#| msgid "in the future"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"пÑ?е\n"
+"Ñ? бÑ?дÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "Ñ?Ñ?енÑ?Ñ?но вÑ?еме"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"Ñ?екÑ?нди\n"
+"минÑ?Ñ?и\n"
+"Ñ?аÑ?и\n"
+"дани\n"
+"недеÑ?е\n"
+"меÑ?еÑ?и\n"
+"године"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "вÑ?еме коÑ?е одÑ?едиÑ?е"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "недеÑ?е"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "године"
+#| msgid "a time relative to the current time"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"Ñ?Ñ?енÑ?Ñ?но вÑ?еме\n"
+"вÑ?еме коÑ?е одÑ?едиÑ?е\n"
+"вÑ?еме Ñ? одноÑ?Ñ? на Ñ?Ñ?енÑ?Ñ?но вÑ?еме"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Ð?одаÑ? пÑ?авило"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "УÑ?еди пÑ?авило"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Ð?ме пÑ?авила"
 
@@ -11865,8 +10543,7 @@ msgid "Composer Preferences"
 msgstr "Ð?оÑ?Ñ?авке Ñ?аÑ?Ñ?авÑ?аÑ?а"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "Ð?одеÑ?иÑ?е поÑ?Ñ?Ñ?, Ñ?кÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?и Ñ?игÑ?Ñ?ноÑ?Ñ? и пÑ?иказ поÑ?Ñ?ке, овде"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11910,21 +10587,24 @@ msgid "Evolution Network configuration control"
 msgstr "Ð?онÑ?Ñ?ола мÑ?ежниÑ? подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620
+#: ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Ð?оÑ?Ñ?а"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "Ð?оÑ?Ñ?анÑ?ки налози"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Ð?оÑ?Ñ?авке поÑ?Ñ?е"
 
@@ -11933,16 +10613,128 @@ msgid "Network Preferences"
 msgstr "Ð?оÑ?Ñ?авке мÑ?еже"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Ð?оÑ?Ñ?а"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133
+#: ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "Ð?Ñ?оÑ?л_еди"
+
+#: ../mail/e-attachment-handler-mail.c:147
+#: ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "_Ð?дговоÑ?и поÑ?иÑ?аоÑ?Ñ?"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "%d attached messages"
+msgstr "%d пÑ?иложениÑ? поÑ?Ñ?ка"
+
+#: ../mail/e-mail-attachment-bar.c:122
+#: ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Ð?Ñ?илог"
+msgstr[1] "Ð?Ñ?илози"
+msgstr[2] "Ð?Ñ?илога"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+#| msgid "Month View"
+msgid "Icon View"
+msgstr "Ð?Ñ?еглед Ñ?а иконама"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+#| msgid "_List View"
+msgid "List View"
+msgstr "Ð?Ñ?еглед Ñ?а Ñ?пиÑ?ком"
+
+# bug: plural-forms if put as "%d matches"
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Ð?оклапаÑ?а: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+#| msgid "Close this window"
+msgid "Close the find bar"
+msgstr "Ð?аÑ?воÑ?и Ñ?Ñ?акÑ? пÑ?еÑ?Ñ?аге"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "Ð?Ñ?о_наÑ?и:"
+
+#: ../mail/e-mail-search-bar.c:540
+#| msgid "Always search"
+msgid "Clear the search"
+msgstr "Ð?Ñ?иÑ?Ñ?и пÑ?еÑ?Ñ?агÑ?"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Ð?Ñ?еÑ?Ñ?одно"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "Ð?аÑ?и пÑ?еÑ?Ñ?одно поÑ?авÑ?иваÑ?е Ñ?Ñ?азе"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_СледеÑ?е"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "Ð?аÑ?и Ñ?ледеÑ?е поÑ?авÑ?иваÑ?е Ñ?Ñ?азе"
+
+#: ../mail/e-mail-search-bar.c:587
+#| msgid "M_atch case"
+msgid "Mat_ch case"
+msgstr "Ð?а_зи на велиÑ?инÑ? Ñ?лова"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "СÑ?Ñ?аниÑ?а пÑ?егледана до дна, наÑ?Ñ?авÑ?ено од вÑ?Ñ?а"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "СÑ?Ñ?аниÑ?а пÑ?егледана до вÑ?Ñ?а, наÑ?Ñ?авÑ?ено од дна"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Ð?е коÑ?иÑ?Ñ?и Ñ?е Ñ?иÑ?Ñ?оваÑ?е"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS Ñ?иÑ?Ñ?оваÑ?е"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL Ñ?иÑ?Ñ?оваÑ?е"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Ñ?говоÑ? о лиÑ?енÑ?и"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11955,110 +10747,126 @@ msgstr ""
 "за %s\n"
 "и ознаÑ?иÑ?е кÑ?Ñ?иÑ?Ñ? да би га пÑ?иÑ?ваÑ?или\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487
+#: ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?аÑ?Ñ?авÑ?ено"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Ð?икада"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Увек"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Ð?иÑ?аÑ? за Ñ?вакÑ? поÑ?Ñ?кÑ?"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877
+#: ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Ð?денÑ?иÑ?еÑ?"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928
+#: ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Ð?Ñ?имаÑ?е поÑ?Ñ?е"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "Ð?Ñ?овеÑ?и за _новÑ? поÑ?Ñ?Ñ? Ñ?вакиÑ?"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "минÑ?_Ñ?а"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420
+#: ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "СлаÑ?е поÑ?Ñ?е"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2479
+#: ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Ð?одÑ?азÑ?мевано"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2545
+#: ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "СигÑ?Ñ?ноÑ?Ñ?"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2582
+#: ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "Ð?пÑ?иÑ?е за пÑ?имаÑ?е"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583
+#: ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
-msgstr "Ð?Ñ?овеÑ?ам за нове поÑ?Ñ?ке"
+msgstr "Ð?Ñ?овеÑ?аÑ?е за нове поÑ?Ñ?ке"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "УÑ?еÑ?иваÑ? налога"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3145
+#: ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
-msgstr "Ð?омоÑ?ник Ð?волÑ?Ñ?иÑ?а налога"
+msgstr "Ð?омоÑ?ник налога Ð?волÑ?Ñ?иÑ?е"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Ð?одÑ?азÑ?мевано]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Ð?ме налога"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Ð?Ñ?оÑ?окол"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1203 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318
+#: ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160
+#: ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Ð?ез имена"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Ð?език(Ñ?и)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Ð?одаÑ? Ñ?кÑ?ипÑ?Ñ? за поÑ?пиÑ?"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Ð?оÑ?пиÑ?(и)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Ð?Ñ?оÑ?леÑ?ена поÑ?Ñ?ка --------"
 
-#: ../mail/em-composer-utils.c:1602
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
+#: ../mail/em-composer-utils.c:1585
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr "Ð?иÑ?е доÑ?Ñ?авÑ?ена одÑ?едиÑ?на адÑ?еÑ?а, пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ке Ñ?е оÑ?казано."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
+msgstr "Ð?иÑ?е пÑ?онаÑ?ен налог за коÑ?иÑ?Ñ?еÑ?е, пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ке Ñ?е оÑ?казано."
 
 #: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
@@ -12070,18 +10878,14 @@ msgstr "непознаÑ?и поÑ?иÑ?алаÑ?"
 #. * 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:2105
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. Ñ? ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} пиÑ?е:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. Ñ? ${24Hour}:${Minute} ${TimeZone}, ${Sender} пиÑ?е:"
 
 #: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Ð?Ñ?игинална поÑ?Ñ?ка-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "Ð?Ñ?_авила Ñ?илÑ?еÑ?а"
 
@@ -12098,18 +10902,10 @@ msgstr "Ð?одели боÑ?Ñ?"
 msgid "Assign Score"
 msgstr "Ð?одели Ñ?езÑ?лÑ?аÑ?"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Ð?воно"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Ð?авÑ?Ñ?ено за"
@@ -12127,9 +10923,11 @@ msgid "Date sent"
 msgstr "Ð?аÑ?Ñ?м Ñ?лаÑ?а"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../plugins/groupwise-features/share-folder.c:765
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ð?бÑ?иÑ?и"
@@ -12160,7 +10958,7 @@ msgstr "не поÑ?иÑ?е Ñ?а"
 
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
-msgstr "Ð?Ñ?ипÑ?ема"
+msgstr "Ð?аÑ?Ñ?Ñ?"
 
 #: ../mail/em-filter-i18n.h:24
 msgid "ends with"
@@ -12178,228 +10976,246 @@ msgstr "Ð?зÑ?аз"
 msgid "Follow Up"
 msgstr "Следи"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#| msgid "Forward"
+msgid "Forward to"
+msgstr "Ð?Ñ?оÑ?леди за"
+
+#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Ð?ажно"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ñ?е поÑ?ле"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "Ñ?е пÑ?е"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "Ñ?е ознаÑ?ено"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ниÑ?е ознаÑ?ено"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ниÑ?е подеÑ?ено"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "подеÑ?ено"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ð?Ñ?бÑ?е"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Ð?Ñ?овеÑ?а Ñ?Ñ?бÑ?еÑ?а"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Ð?Ñ?икеÑ?а"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Ð?опиÑ?на лиÑ?Ñ?а"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Ð?дговаÑ?а Ñ?ве"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Тело поÑ?Ñ?ке"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Ð?аглавÑ?е поÑ?Ñ?ке"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Ð?оÑ?Ñ?ка Ñ?е Ñ?Ñ?бÑ?е"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Ð?оÑ?Ñ?ка ниÑ?е Ñ?Ñ?бÑ?е"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+#| msgid "Message contains"
+msgid "Message Location"
+msgstr "Ð?окаÑ?иÑ?а поÑ?Ñ?ке"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Ð?Ñ?емеÑ?Ñ?и Ñ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Ð?овежи на пÑ?огÑ?ам"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Ð?Ñ?Ñ?Ñ?и звÑ?к"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "ЧиÑ?аÑ?"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Ð?Ñ?имаоÑ?и"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex одговаÑ?а"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Ð?дговоÑ?ено"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "повÑ?аÑ?но"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "повÑ?аÑ?но веÑ?е од"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "повÑ?аÑ?но маÑ?е од"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Ð?окÑ?ени пÑ?огÑ?ам"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "РезÑ?лÑ?аÑ?"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Ð?оÑ?иÑ?алаÑ?"
 
 # bug(slobo): веÑ?оваÑ?но извеÑ?Ñ?аÑ? о доÑ?Ñ?ави
-#: ../mail/em-filter-i18n.h:62
-#, fuzzy
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
-msgstr "Ð?оÑ?аÑ?и пÑ?изнаниÑ?Ñ?"
+msgstr "Ð?оÑ?иÑ?алаÑ? или пÑ?имаоÑ?и"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Ð?оÑ?Ñ?ави ознакÑ?"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Ð?оÑ?Ñ?ави Ñ?Ñ?аÑ?Ñ?Ñ?"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Ð?елиÑ?ина (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "звÑ?Ñ?и као"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Ð?звоÑ?ни налог"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Ð?дÑ?еÑ?ено заглавÑ?е"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "поÑ?иÑ?е Ñ?а"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Ð?Ñ?екини обÑ?адÑ?"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928
+#: ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Ð?аÑ?лов"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Ð?епоÑ?Ñ?авÑ?ен Ñ?Ñ?аÑ?Ñ?Ñ?"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Ð?оÑ?ом"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Ð?одаÑ? Ñ?а_дÑ?Ñ?"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Ð?апÑ?ави ФаÑ?Ñ?иклÑ? пÑ?еÑ?Ñ?аге из пÑ?еÑ?Ñ?аге..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Све поÑ?Ñ?ке"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Ð?епÑ?оÑ?иÑ?ане поÑ?Ñ?ке"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Ð?ез ознаке"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Ð?Ñ?оÑ?иÑ?ане поÑ?Ñ?ке"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "СкоÑ?аÑ?Ñ?е поÑ?Ñ?ке"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Ð?оÑ?Ñ?ке Ñ? задÑ?иÑ? 5 дана"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Ð?оÑ?Ñ?ке Ñ?а пÑ?илозима"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Ð?ажне поÑ?Ñ?ке"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Ð?оÑ?Ñ?ке ниÑ?Ñ? Ñ?Ñ?бÑ?е"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Ð?Ñ?еÑ?Ñ?ага налога"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "Ð?Ñ?еÑ?Ñ?ага Ñ?виÑ? налога"
 
@@ -12435,11 +11251,13 @@ msgid "Quota usage"
 msgstr "Ð?Ñ?коÑ?иÑ?Ñ?еноÑ?Ñ? квоÑ?е"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2598 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359
+#: ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602
+#: ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "СандÑ?Ñ?е"
 
@@ -12452,236 +11270,261 @@ msgstr "Ð?Ñ?обине Ñ?аÑ?Ñ?икле"
 msgid "<click here to select a folder>"
 msgstr "<кликниÑ?е овде да изабеÑ?еÑ?е Ñ?аÑ?Ñ?иклÑ?>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "Ð?а_пÑ?ави"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "_Ð?ме Ñ?аÑ?Ñ?икле:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195
+#: ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960
+#: ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "ФаÑ?Ñ?икле пÑ?еÑ?Ñ?аге"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?РÐ?"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510
+#: ../mail/mail-component.c:169
 msgid "Drafts"
-msgstr "Ð?Ñ?ипÑ?ема"
+msgstr "Ð?аÑ?Ñ?Ñ?и"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513
+#: ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Шаблони"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520
+#: ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Ð?а Ñ?лаÑ?е"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522
+#: ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Ð?оÑ?лаÑ?о"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580
+#: ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "УÑ?иÑ?аваÑ?е..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:318
 #, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "СÑ?абло Ñ?аÑ?Ñ?икле за поÑ?Ñ?Ñ?"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ð?Ñ?емеÑ?Ñ?аÑ?е Ñ?аÑ?Ñ?икле %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "УмножаваÑ?е Ñ?аÑ?Ñ?икле %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895
+#: ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Ð?Ñ?емеÑ?Ñ?аÑ?е поÑ?Ñ?ка Ñ? Ñ?аÑ?Ñ?иклÑ? %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897
+#: ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "УмножаваÑ?е поÑ?Ñ?ка Ñ? Ñ?аÑ?Ñ?иклÑ? %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?баÑ?иÑ?и поÑ?Ñ?кÑ?(е) Ñ? оÑ?Ñ?авÑ? на наÑ?виÑ?ем нивоÑ?"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Умножи Ñ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Ð?Ñ?емеÑ?Ñ?и Ñ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186
+#: ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "Ð?Ñ?е_меÑ?Ñ?и"
+
+#: ../mail/em-folder-tree.c:994
+#: ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Ð?Ñ?кажи _пÑ?евлаÑ?еÑ?е"
+
+#: ../mail/em-folder-tree.c:1702
+#: ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ð?Ñ?еÑ?Ñ?ага Ñ?аÑ?Ñ?икли Ñ? â??%sâ??"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Ð?Ñ?воÑ?и Ñ? _новом пÑ?озоÑ?Ñ?"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_Ð?ова Ñ?аÑ?Ñ?икла..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Ð?Ñ?емеÑ?Ñ?и..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Ð?_Ñ?вежи"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "Ð?Ñ?_пÑ?азни Ð?а Ñ?лаÑ?е"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
-msgstr "Ð?Ñ?пÑ?азни _Ñ?меÑ?е"
+msgstr "Ð?Ñ?пÑ?азни _СмеÑ?е"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
-msgstr ""
+msgstr "_Ð?епÑ?оÑ?иÑ?ана ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "УмножаваÑ?е â??%sâ?? Ñ? â??%sâ??"
+msgstr "УмножаваÑ?е â??%sâ?? Ñ? â??%sâ??"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Умножи"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
-msgstr "Ð?Ñ?авÑ?еÑ?е Ñ?аÑ?Ñ?икле â??%sâ??"
+msgstr "Ð?Ñ?авÑ?еÑ?е Ñ?аÑ?Ñ?икле â??%sâ??"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Ð?апÑ?ави Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Ð?аведиÑ?е где напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ?:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ð?еÑ?Ñ?пеÑ?но бÑ?иÑ?аÑ?е поÑ?Ñ?е"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Ð?емаÑ?е довоÑ?на овлаÑ?Ñ?еÑ?а да обÑ?иÑ?еÑ?е овÑ? поÑ?Ñ?Ñ?."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "_Ð?дговоÑ?и поÑ?иÑ?аоÑ?Ñ?"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "Ð?Ñ?оÑ?л_еди"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_УÑ?еди као новÑ? поÑ?Ñ?кÑ?..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Ð?ониÑ?_Ñ?и бÑ?иÑ?аÑ?е"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Ð?Ñ?емеÑ?Ñ?и Ñ? Ñ?аÑ?Ñ?иклÑ?..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Умножи Ñ? Ñ?аÑ?Ñ?иклÑ?..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Ð?_знаÑ?и као пÑ?оÑ?иÑ?ано"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Ð?знаÑ?и као _непÑ?оÑ?иÑ?ано"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Ð?наÑ?и као _важно"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "_Ð?знаÑ?и као неважно"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Ð?знаÑ?и као _Ñ?Ñ?бÑ?е"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Ð?знаÑ?и да _ниÑ?е Ñ?Ñ?бÑ?е"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Ð?бележи за _пÑ?аÑ?еÑ?е..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
-msgstr "Ð?аÑ?_пиÑ?"
+msgstr "_Ð?знака"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -12690,705 +11533,645 @@ msgstr "Ð?аÑ?_пиÑ?"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355
+#: ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "Ð?иÑ?Ñ?_а"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Ð?ова ознака"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ð?знаÑ?_и као завÑ?Ñ?ено"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознакÑ?"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Ð?а_пÑ?ави пÑ?авило од поÑ?Ñ?ке"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
-msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на _Ñ?емÑ?"
+msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на _наÑ?лов"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на п_оÑ?иÑ?аоÑ?а"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на _пÑ?имаоÑ?е"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на допиÑ?нÑ? _лиÑ?Ñ?Ñ?"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
-msgstr "ФилÑ?еÑ? на Ñ?е_мÑ?"
+msgstr "ФилÑ?еÑ? на наÑ?_лов"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "ФилÑ?еÑ? на п_оÑ?иÑ?аоÑ?а"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "ФилÑ?еÑ? на п_Ñ?имаоÑ?е"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "ФилÑ?еÑ? на _допиÑ?нÑ? лиÑ?Ñ?Ñ?"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232
+#: ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "Ð?одÑ?азÑ?мевано"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ?"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "Ð?овлаÑ?еÑ?е поÑ?Ñ?ке..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "Ð?_озив за..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "Ð?апÑ?ави ФаÑ?Ñ?иклÑ? _пÑ?еÑ?Ñ?аге"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_Са ове адÑ?еÑ?е"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "_на овÑ? адÑ?еÑ?Ñ?"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Ð?ликниÑ?е да поÑ?аÑ?еÑ?е %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "Ð?ликниÑ?е да позовеÑ?е %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
-msgstr "Ð?Ñ?иÑ?иÑ?ни да Ñ?акÑ?иÑ?еÑ?/оÑ?киÑ?Ñ?еÑ? адÑ?еÑ?Ñ?"
+msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е да Ñ?акÑ?иÑ?еÑ?е/оÑ?кÑ?иÑ?еÑ?е адÑ?еÑ?е"
 
-# bug: plural-forms if put as "%d matches"
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "Ð?оклапаÑ?а: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "Ð?Ñ?о_наÑ?и:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_Ð?Ñ?еÑ?Ñ?одно"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_СледеÑ?е"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "_Ð?одÑ?даÑ?аÑ? велико/мало Ñ?лово"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Ð?епоÑ?пиÑ?ано"
 
-#: ../mail/em-format-html-display.c:951
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:560
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "Ð?ва поÑ?Ñ?ка ниÑ?е поÑ?пиÑ?ана. Ð?иÑ?е Ñ?игÑ?Ñ?но да Ñ?е ова поÑ?Ñ?ка аÑ?Ñ?енÑ?иÑ?на."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Ð?Ñ?пÑ?аван поÑ?пиÑ?"
 
-#: ../mail/em-format-html-display.c:952
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Ð?ва поÑ?Ñ?ка Ñ?е поÑ?пиÑ?ана и иÑ?пÑ?авна Ñ?Ñ?о знаÑ?и да Ñ?е поÑ?иÑ?алаÑ? поÑ?Ñ?ке вÑ?ло "
-"веÑ?оваÑ?но аÑ?Ñ?енÑ?иÑ?ан."
+#: ../mail/em-format-html-display.c:561
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Ð?ва поÑ?Ñ?ка Ñ?е поÑ?пиÑ?ана и иÑ?пÑ?авна Ñ?Ñ?о знаÑ?и да Ñ?е поÑ?иÑ?алаÑ? поÑ?Ñ?ке вÑ?ло веÑ?оваÑ?но аÑ?Ñ?енÑ?иÑ?ан."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Ð?еиÑ?пÑ?аван поÑ?пиÑ?"
 
-#: ../mail/em-format-html-display.c:953
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Ð?оÑ?пиÑ? ове поÑ?Ñ?ке ниÑ?е могао биÑ?и пÑ?овеÑ?ен, можда Ñ?е измеÑ?ена Ñ? пÑ?еноÑ?Ñ?."
+#: ../mail/em-format-html-display.c:562
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Ð?оÑ?пиÑ? ове поÑ?Ñ?ке ниÑ?е могао биÑ?и пÑ?овеÑ?ен, можда Ñ?е измеÑ?ена Ñ? пÑ?еноÑ?Ñ?."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ð?Ñ?пÑ?аван поÑ?пиÑ?, али ниÑ?е могÑ?Ñ?а пÑ?овеÑ?а поÑ?иÑ?аоÑ?а"
 
-#: ../mail/em-format-html-display.c:954
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Ð?ва поÑ?Ñ?ка Ñ?е поÑ?пиÑ?ана иÑ?пÑ?авним поÑ?пиÑ?ом, али поÑ?иÑ?алаÑ? поÑ?Ñ?ке не може "
-"биÑ?и пÑ?овеÑ?ен."
+#: ../mail/em-format-html-display.c:563
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Ð?ва поÑ?Ñ?ка Ñ?е поÑ?пиÑ?ана иÑ?пÑ?авним поÑ?пиÑ?ом, али поÑ?иÑ?алаÑ? поÑ?Ñ?ке не може биÑ?и пÑ?овеÑ?ен."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Ð?оÑ?пиÑ? поÑ?Ñ?оÑ?и, али Ñ?Ñ?ажи Ñ?авни кÑ?Ñ?Ñ?"
 
-#: ../mail/em-format-html-display.c:955
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../mail/em-format-html-display.c:564
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "Ð?ва поÑ?Ñ?ка Ñ?е поÑ?пиÑ?ана, али нема одговаÑ?аÑ?Ñ?Ñ?ег Ñ?авног кÑ?Ñ?Ñ?а."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Ð?еÑ?иÑ?Ñ?овано"
 
-#: ../mail/em-format-html-display.c:962
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Ð?ва поÑ?Ñ?ка ниÑ?е Ñ?иÑ?Ñ?ована.  Ð?ен Ñ?адÑ?жаÑ? Ñ?е могÑ?Ñ?е видеÑ?и Ñ? пÑ?еноÑ?Ñ? пÑ?еко "
-"Ð?нÑ?еÑ?неÑ?а."
+#: ../mail/em-format-html-display.c:571
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "Ð?ва поÑ?Ñ?ка ниÑ?е Ñ?иÑ?Ñ?ована. Ð?ен Ñ?адÑ?жаÑ? Ñ?е могÑ?Ñ?е видеÑ?и Ñ? пÑ?еноÑ?Ñ? пÑ?еко Ð?нÑ?еÑ?неÑ?а."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "ШиÑ?Ñ?овано, Ñ?лабо"
 
-#: ../mail/em-format-html-display.c:963
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"Ð?ва поÑ?Ñ?ка Ñ?е Ñ?иÑ?Ñ?ована, али Ñ?лабим алгоÑ?иÑ?мом.  ТеÑ?ко Ñ?е, али не и немогÑ?Ñ?е "
-"да неко Ñ?а Ñ?Ñ?Ñ?ане Ñ? догледно вÑ?еме види Ñ?адÑ?жаÑ? ове поÑ?Ñ?ке."
+#: ../mail/em-format-html-display.c:572
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "Ð?ва поÑ?Ñ?ка Ñ?е Ñ?иÑ?Ñ?ована, али Ñ?лабим алгоÑ?иÑ?мом.  ТеÑ?ко Ñ?е, али не и немогÑ?Ñ?е да неко Ñ?а Ñ?Ñ?Ñ?ане Ñ? догледно вÑ?еме види Ñ?адÑ?жаÑ? ове поÑ?Ñ?ке."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "ШиÑ?Ñ?овано"
 
-#: ../mail/em-format-html-display.c:964
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Ð?ва поÑ?Ñ?ка Ñ?е Ñ?иÑ?Ñ?ована.  ТеÑ?ко Ñ?е неко Ñ?а Ñ?Ñ?Ñ?ане видеÑ?и Ñ?адÑ?жаÑ? ове поÑ?Ñ?ке."
+#: ../mail/em-format-html-display.c:573
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "Ð?ва поÑ?Ñ?ка Ñ?е Ñ?иÑ?Ñ?ована.  ТеÑ?ко Ñ?е неко Ñ?а Ñ?Ñ?Ñ?ане видеÑ?и Ñ?адÑ?жаÑ? ове поÑ?Ñ?ке."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "ШиÑ?Ñ?овано, Ñ?ако"
 
-#: ../mail/em-format-html-display.c:965
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"Ð?ва поÑ?Ñ?ка Ñ?е Ñ?иÑ?Ñ?ована â?? и Ñ?о Ñ?аким алгоÑ?иÑ?мом.  Ð?еома Ñ?е Ñ?еÑ?ко да неко Ñ?а "
-"Ñ?Ñ?Ñ?ане Ñ? догледно вÑ?еме види Ñ?адÑ?жаÑ? ове поÑ?Ñ?ке."
+#: ../mail/em-format-html-display.c:574
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "Ð?ва поÑ?Ñ?ка Ñ?е Ñ?иÑ?Ñ?ована, Ñ?аким алгоÑ?иÑ?мом. Ð?еома Ñ?е Ñ?еÑ?ко да неко Ñ?а Ñ?Ñ?Ñ?ане Ñ? догледно вÑ?еме види Ñ?адÑ?жаÑ? ове поÑ?Ñ?ке."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Ð?Ñ?е_гледаÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "Ð?ваÑ? Ñ?еÑ?Ñ?иÑ?икаÑ? ниÑ?е Ñ?иÑ?Ñ?ив"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Ð?авÑ?Ñ?ено Ñ? %B %d, %Y, %l:%M %p"
+#: ../mail/em-format-html-display.c:980
+#| msgid "Completed On"
+msgid "Completed on"
+msgstr "Ð?авÑ?Ñ?ено за"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "Ð?Ñ?екоÑ?аÑ?ено:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "до %B %d, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "од"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "Ð?Ñ?е_гледаÑ? Ñ?нÑ?Ñ?аÑ?"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_СакÑ?иÑ?"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "_Ð?Ñ?илагоди на Ñ?иÑ?инÑ?"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "Ð?Ñ?икажи _оÑ?игиналнÑ? велиÑ?инÑ?"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "СаÑ?Ñ?ваÑ? пÑ?илог као"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ? за Ñ?Ñ?ваÑ?е Ñ?виÑ? пÑ?илога"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "Ð?забÑ?ано Ñ?Ñ?ваÑ?е..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d пÑ?и_лог"
-msgstr[1] "%d пÑ?и_лога"
-msgstr[2] "%d пÑ?и_логa"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "_СаÑ?Ñ?ваÑ?"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "СаÑ?_Ñ?ваÑ? Ñ?ве"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "Ð?ема пÑ?илога"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575
+#: ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Ð?Ñ?егледаÑ? _неÑ?оÑ?маÑ?иÑ?ано"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "СакÑ?иÑ? _неÑ?оÑ?маÑ?иÑ?ано"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "Ð?_Ñ?воÑ?и помоÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:2668
-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:1711
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Ð?волÑ?Ñ?иÑ?а не може да иÑ?Ñ?Ñ?Ñ?а ово пиÑ?мо поÑ?Ñ?о Ñ?е пÑ?евелико. Ð?ожеÑ?е га погледаÑ?и неÑ?оÑ?маÑ?иÑ?ано или помоÑ?Ñ? дÑ?Ñ?гог Ñ?Ñ?еÑ?иваÑ?а Ñ?екÑ?Ñ?а."
 
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. Ñ?Ñ?Ñ?ана од %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505
+#: ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Ð?овлаÑ?еÑ?е â??%sâ??"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "Ð?епознаÑ? Ñ?поÑ?ни део поÑ?Ñ?ке."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "Ð?оÑ?е Ñ?ложен Ñ?поÑ?ни део поÑ?Ñ?ке."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ð?оказиваÑ? на FTP Ñ?Ñ?Ñ?аниÑ?Ñ? (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ð?оказиваÑ? на локалнÑ? даÑ?оÑ?екÑ? (%s) коÑ?а одговаÑ?а Ñ?Ñ?Ñ?аниÑ?и â??%sâ??"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ð?оказиваÑ? на локалнÑ? даÑ?оÑ?екÑ? (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ð?оказиваÑ? на мÑ?ежни подаÑ?ак (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ð?оказиваÑ? на непознаÑ?и Ñ?поÑ?ни подаÑ?ак (Ñ?ипа â??%sâ??)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Ð?бликоваÑ?е поÑ?Ñ?ке"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Ð?бликоваÑ?е поÑ?Ñ?ке..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926
+#: ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Ð?опиÑ?а (Cc)"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568
+#: ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927
+#: ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Ð?евидÑ?ива копиÑ?а (Bcc)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1459
+#: ../mail/em-format-html.c:1747
+#: ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Ð?оÑ?иÑ?алаÑ?"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr "(%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr "(%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Ð?оÑ?Ñ?кÑ? Ñ?аÑ?е <b>%s</b> Ñ? име <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "ШаÑ?е"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Ð?дговоÑ?"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929
+#: ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Ð?аÑ?Ñ?м"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930
+#: ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Ð?Ñ?Ñ?пе за веÑ?Ñ?и"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931
+#: ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Ð?иÑ?е"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s пÑ?илог"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада S/MIME поÑ?Ñ?ке: непознаÑ?а гÑ?еÑ?ка"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376
+#: ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада MIME поÑ?Ñ?ке. Ð?Ñ?иказиваÑ?е извоÑ?а."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Ð?еподÑ?жани Ñ?ип Ñ?иÑ?Ñ?е за multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада PGP/MIME поÑ?Ñ?ке"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада PGP/MIME поÑ?Ñ?ке: непознаÑ?а гÑ?еÑ?ка"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Ð?еподÑ?жан облик поÑ?пиÑ?а"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?овеÑ?и поÑ?пиÑ?а"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1689
+#: ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Ð?епознаÑ?а гÑ?еÑ?ка пÑ?и пÑ?овеÑ?и поÑ?пиÑ?а"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада PGP поÑ?Ñ?ке."
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада PGP/MIME поÑ?Ñ?ке: непознаÑ?а гÑ?еÑ?ка"
 
 # bug: requires a comment on usage
 # Ñ?лиÑ?но као за меÑ?еÑ?е и недеÑ?е
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Ñ?ваки пÑ?Ñ?"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Ñ?едном дневно"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Ñ?едном недеÑ?но"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Ñ?едном меÑ?еÑ?но"
 
-#: ../mail/em-mailer-prefs.c:333
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "Ð?одаÑ?е пÑ?илагоÑ?ено заглавÑ?е за нежеÑ?енÑ? поÑ?Ñ?Ñ?"
 
-#: ../mail/em-mailer-prefs.c:337
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "Ð?азив Ñ?аÑ?Ñ?икле:"
 
-#: ../mail/em-mailer-prefs.c:338
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "Ð?Ñ?едноÑ?Ñ? заглавÑ?а Ñ?адÑ?жи:"
 
-#: ../mail/em-mailer-prefs.c:444
+#: ../mail/em-mailer-prefs.c:438
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Ð?аглавÑ?е"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "СадÑ?жи вÑ?едноÑ?Ñ?"
 
-#: ../mail/em-mailer-prefs.c:467
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "Ð?оÑ?а"
 
-#: ../mail/em-mailer-prefs.c:470
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "Ð?Ñ?икеÑ?а"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1063
+#: ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Ð?оÑ?Ñ?Ñ?пан Ñ?е %s додаÑ?ак и бинаÑ?ни облик Ñ?е инÑ?Ñ?алиÑ?ан."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1095 ../mail/em-mailer-prefs.c:1150
+#: ../mail/em-mailer-prefs.c:1071
+#: ../mail/em-mailer-prefs.c:1126
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Ð?одаÑ?ак %s ниÑ?е доÑ?Ñ?Ñ?пан. Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е пакеÑ? инÑ?Ñ?алиÑ?ан."
 
-#: ../mail/em-mailer-prefs.c:1116
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "Ð?ема доÑ?Ñ?Ñ?пног додаÑ?ка за Ñ?Ñ?бÑ?е"
 
+#: ../mail/em-mailer-prefs.c:1455
+#| msgid "Table header"
+msgid "Date header:"
+msgstr "Ð?аглавÑ?е даÑ?Ñ?ма:"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "Ð?а Ñ?Ñ?адиÑ?и"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "Ð?аÑ?ниÑ?е"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
-msgstr ""
+msgstr "Ð?Ñ?елазак"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е нове Ñ?аÑ?Ñ?икле â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е нове Ñ?аÑ?Ñ?икле â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?еÑ?Ñ?ага за поÑ?Ñ?оÑ?еÑ?им поÑ?Ñ?анÑ?ким Ñ?андÑ?Ñ?иÑ?има Ñ? â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?еÑ?Ñ?ага за поÑ?Ñ?оÑ?еÑ?им поÑ?Ñ?анÑ?ким Ñ?андÑ?Ñ?иÑ?има Ñ? â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Ð?еÑ?Ñ?о и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли поÑ?Ñ?е Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од Ð?волÑ?Ñ?иÑ?е 1."
-"Ñ?.\n"
+"Ð?еÑ?Ñ?о и Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?а Ñ?аÑ?Ñ?икли поÑ?Ñ?е Ñ? Ð?волÑ?Ñ?иÑ?и Ñ?е измеÑ?ена од Ð?волÑ?Ñ?иÑ?е 1.Ñ?.\n"
 "\n"
 "Ð?олим бÑ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?Ñ?аÑ?ог POP Ñ?Ñ?ваÑ?-на-Ñ?еÑ?веÑ?Ñ? подаÑ?ка â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?Ñ?аÑ?ог POP Ñ?Ñ?ваÑ?-на-Ñ?еÑ?веÑ?Ñ? подаÑ?ка â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е POP3 Ñ?Ñ?ваÑ?-на-Ñ?еÑ?веÑ?Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ма подаÑ?ака â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е POP3 Ñ?Ñ?ваÑ?-на-Ñ?еÑ?веÑ?Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ма подаÑ?ака â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множаваÑ?е POP3 Ñ?Ñ?ваÑ?-на-Ñ?еÑ?веÑ?Ñ? подаÑ?ка â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множаваÑ?е POP3 Ñ?Ñ?ваÑ?-на-Ñ?еÑ?веÑ?Ñ? подаÑ?ка â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504
+#: ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Ð?иÑ?е Ñ?Ñ?пело пÑ?авÑ?еÑ?е локалне оÑ?Ñ?аве поÑ?Ñ?е â??%sâ??: %s"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело пÑ?авÑ?еÑ?е локалне оÑ?Ñ?аве поÑ?Ñ?е â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
-msgstr ""
+msgstr "Ð?Ñ?еноÑ?еÑ?е Ñ?аÑ?Ñ?икли"
 
-#: ../mail/em-migrate.c:2974
-#, fuzzy
+#: ../mail/em-migrate.c:2874
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ФоÑ?маÑ? пÑ?егледа Ñ?аÑ?Ñ?икли поÑ?Ñ?е пÑ?ебаÑ?ен Ñ?е на sqlite поÑ?ев од Ð?волÑ?Ñ?иÑ?е "
-"2.24.\n"
+"ФоÑ?маÑ? Ñ?ажеÑ?ка Ñ?аÑ?Ñ?икли поÑ?Ñ?е пÑ?ебаÑ?ен Ñ?е на SQLite Ñ?оÑ? од Ð?волÑ?Ñ?иÑ?е 2.24.\n"
 "\n"
 "Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви док Ð?волÑ?Ñ?иÑ?а пÑ?еноÑ?и Ñ?аÑ?Ñ?икле..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е локалниÑ? Ñ?аÑ?Ñ?икли поÑ?Ñ?е Ñ? â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е локалниÑ? Ñ?аÑ?Ñ?икли поÑ?Ñ?е Ñ? â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:3075
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?аÑ?е подеÑ?аваÑ?а пÑ?еÑ?Ñ?одне инÑ?Ñ?алаÑ?иÑ?е Ð?волÑ?Ñ?иÑ?е, â??evolution/"
-"config.xmldbâ?? не поÑ?Ñ?оÑ?и или Ñ?е оÑ?Ñ?еÑ?ен."
+#: ../mail/em-migrate.c:2974
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?аÑ?е поÑ?Ñ?авке пÑ?еÑ?Ñ?одне инÑ?Ñ?алаÑ?иÑ?е Ð?волÑ?Ñ?иÑ?е, â??evolution/config.xmldbâ?? не поÑ?Ñ?оÑ?и или Ñ?е оÑ?Ñ?еÑ?ен."
+
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "СаÑ?Ñ?ваÑ? као..."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "неименована_Ñ?лика.%s"
+
+#: ../mail/em-popup.c:495
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Ð?оÑ?Ñ?ави као _позадинÑ?"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Ð?дговоÑ?и поÑ?иÑ?аоÑ?Ñ?"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Ð?дговоÑ?и на _лиÑ?Ñ?Ñ?"
 
 #. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
+#: ../mail/em-popup.c:547
+#: ../mail/em-popup.c:746
 msgid "_Add to Address Book"
-msgstr "Ð?одаÑ? Ñ? _именик"
+msgstr "Ð?одаÑ? Ñ? _адÑ?еÑ?аÑ?"
+
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Ð?Ñ?воÑ?и Ñ? %s..."
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ð?ва оÑ?Ñ?ава не подÑ?жава пÑ?иÑ?аве, или ниÑ?Ñ? омогÑ?Ñ?ене."
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Ð?Ñ?иÑ?авÑ?ено"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "ФаÑ?Ñ?икла"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Ð?забеÑ?иÑ?е Ñ?еÑ?веÑ?."
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Ð?иÑ?е изабÑ?ан Ñ?еÑ?веÑ?"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "_Ð?е пÑ?иказÑ?Ñ? поново овÑ? поÑ?Ñ?кÑ?."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
-msgstr "Ð?Ñ?опÑ?Ñ?ни_Ñ?и поÑ?Ñ?ка"
+msgstr "ФилÑ?еÑ?и поÑ?Ñ?ка"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "поÑ?Ñ?ка"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "СаÑ?Ñ?ваÑ? поÑ?Ñ?кÑ?..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Ð?одаÑ? адÑ?еÑ?Ñ?"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Ð?оÑ?Ñ?ке од %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "ФаÑ?_Ñ?икле пÑ?еÑ?Ñ?аге"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Ð?звоÑ? Ñ?аÑ?_Ñ?икле пÑ?еÑ?Ñ?аге"
 
@@ -13406,11 +12189,11 @@ msgstr "ШиÑ?ина пÑ?озоÑ?а â??СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?е
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows Evolution to display text part of limited size"
-msgstr "Ð?озволи еволÑ?Ñ?иÑ?и да пÑ?икаже Ñ?екÑ?Ñ?Ñ?ални део огÑ?аниÑ?ене велиÑ?ине"
+msgstr "Ð?озволи Ð?волÑ?Ñ?иÑ?и да пÑ?икаже Ñ?екÑ?Ñ?Ñ?ални део огÑ?аниÑ?ене велиÑ?ине"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
-msgstr "Увек Ñ?Ñ?ажи пÑ?изнаниÑ?Ñ?"
+msgstr "Увек Ñ?Ñ?ажи повÑ?аÑ?ниÑ?Ñ?"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
@@ -13446,35 +12229,23 @@ msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м Ñ?аÑ?Ñ?авÑ?аÑ?а за Ñ?Ñ?иÑ?аваÑ?е/п
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Сажми пÑ?иказ адÑ?еÑ?а Ñ? Ð?РÐ?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?"
+msgstr "Сажми пÑ?иказ адÑ?еÑ?а Ñ? TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Сажми пÑ?иказ адÑ?еÑ?а Ñ? Ð?РÐ?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð? на бÑ?оÑ? назнаÑ?ен Ñ? "
-"address_count-Ñ?."
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgstr "Сажми пÑ?иказ адÑ?еÑ?а Ñ? TO/CC/BCC на бÑ?оÑ? одÑ?еÑ?ен Ñ? address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Ð?онÑ?Ñ?олиÑ?е Ñ?Ñ?еÑ?Ñ?алоÑ?Ñ? Ñ?Ñ?клаÑ?иваÑ?а локалниÑ? измена Ñ?а мÑ?ежним Ñ?еÑ?веÑ?ом поÑ?Ñ?е. "
-"Ð?нÑ?еÑ?вал моÑ?а биÑ?и наÑ?маÑ?е 30 Ñ?екÑ?нди."
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgstr "Ð?онÑ?Ñ?олиÑ?е Ñ?Ñ?еÑ?Ñ?алоÑ?Ñ? Ñ?Ñ?клаÑ?иваÑ?а локалниÑ? измена Ñ?а мÑ?ежним Ñ?еÑ?веÑ?ом поÑ?Ñ?е. Ð?нÑ?еÑ?вал моÑ?а биÑ?и наÑ?маÑ?е 30 Ñ?екÑ?нди."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Ð?Ñ?илагоÑ?ена заглавÑ?а за Ñ?поÑ?Ñ?ебÑ? пÑ?иликом пÑ?овеÑ?е нежеÑ?ене поÑ?Ñ?е."
 
 #: ../mail/evolution-mail.schemas.in.h:19
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"Ð?Ñ?илагоÑ?ена заглавÑ?а за Ñ?поÑ?Ñ?ебÑ? пÑ?иликом пÑ?овеÑ?е нежеÑ?ене поÑ?Ñ?е. Ð?леменÑ?и "
-"Ñ?пиÑ?ка Ñ?Ñ? низ Ñ?оÑ?маÑ?а â??назив_заглавÑ?а=вÑ?едноÑ?Ñ?â??."
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "Ð?Ñ?илагоÑ?ена заглавÑ?а за Ñ?поÑ?Ñ?ебÑ? пÑ?иликом пÑ?овеÑ?е нежеÑ?ене поÑ?Ñ?е. Ð?леменÑ?и Ñ?пиÑ?ка Ñ?Ñ? низ Ñ?оÑ?маÑ?а â??headername=valueâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13514,7 +12285,7 @@ msgstr "Ð?одÑ?азÑ?мевани Ñ?Ñ?ил одговоÑ?а"
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
-msgstr "Ð?одÑ?азÑ?мевана вÑ?едноÑ?Ñ? за Ñ?аÑ?иÑ?ени низ"
+msgstr "Ð?одÑ?азÑ?мевана вÑ?едноÑ?Ñ? за Ñ?аÑ?иÑ?енÑ? Ñ?аÑ?пÑ?авÑ?"
 
 #: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
@@ -13529,51 +12300,28 @@ msgid "Default width of the subscribe dialog."
 msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина пÑ?озоÑ?Ñ?еÑ?а за пÑ?иÑ?авÑ?."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да Ñ?амо Ñ? адÑ?еÑ?аÑ?Ñ? пÑ?егледа адÑ?еÑ?е Ñ? поÑ?Ñ?ази за нежеÑ?еном "
-"поÑ?Ñ?ом"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgstr "УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да Ñ?амо Ñ? адÑ?еÑ?аÑ?Ñ? пÑ?егледа адÑ?еÑ?е Ñ? поÑ?Ñ?ази за нежеÑ?еном поÑ?Ñ?ом"
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да пÑ?егледа Ñ? адÑ?еÑ?аÑ?Ñ? адÑ?еÑ?е поÑ?иÑ?аоÑ?а"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Ñ?вÑ?Ñ?Ñ?Ñ?е да ли да пÑ?егледа Ñ? адÑ?еÑ?аÑ?Ñ? адÑ?еÑ?е поÑ?иÑ?аоÑ?а. Уколико Ñ?е пÑ?онаÑ?е, "
-"не Ñ?вÑ?Ñ?Ñ?ава Ñ?е Ñ? нежеÑ?енÑ? поÑ?Ñ?Ñ?. ТÑ?ажи Ñ?е Ñ? адÑ?еÑ?аÑ?има ознаÑ?еним за "
-"Ñ?амодопÑ?Ñ?аваÑ?е. Ð?оже биÑ?и Ñ?поÑ?о ако Ñ?Ñ? адÑ?еÑ?аÑ?и (Ñ?еÑ?имо LDAP) ознаÑ?ени за "
-"Ñ?амодопÑ?Ñ?аваÑ?е."
+msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgstr "УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да пÑ?еÑ?Ñ?ажи Ñ? адÑ?еÑ?аÑ?Ñ? адÑ?еÑ?е поÑ?иÑ?аоÑ?а. Уколико Ñ?е пÑ?онаÑ?е, не Ñ?вÑ?Ñ?Ñ?ава Ñ?е Ñ? нежеÑ?енÑ? поÑ?Ñ?Ñ?. ТÑ?ажи Ñ?е Ñ? адÑ?еÑ?аÑ?има ознаÑ?еним за Ñ?амодопÑ?Ñ?аваÑ?е. Ð?оже биÑ?и Ñ?поÑ?о ако Ñ?Ñ? адÑ?еÑ?аÑ?и (Ñ?еÑ?имо LDAP) ознаÑ?ени за Ñ?амодопÑ?Ñ?аваÑ?е."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-"УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да коÑ?иÑ?Ñ?и пÑ?илагоÑ?ена заглавÑ?а пÑ?иликом пÑ?овеÑ?е нежеÑ?ене "
-"поÑ?Ñ?е"
+msgstr "УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да коÑ?иÑ?Ñ?и пÑ?илагоÑ?ена заглавÑ?а пÑ?иликом пÑ?овеÑ?е нежеÑ?ене поÑ?Ñ?е"
 
 #: ../mail/evolution-mail.schemas.in.h:37
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да коÑ?иÑ?Ñ?и пÑ?илагоÑ?ена заглавÑ?а пÑ?иликом пÑ?овеÑ?е нежеÑ?ене "
-"поÑ?Ñ?е. Уколико Ñ?е опÑ?иÑ?а Ñ?кÑ?Ñ?Ñ?ена а заглавÑ?а наведена, пÑ?овеÑ?а Ñ?е биÑ?и бÑ?жа."
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgstr "УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да коÑ?иÑ?Ñ?и пÑ?илагоÑ?ена заглавÑ?а пÑ?иликом пÑ?овеÑ?е нежеÑ?ене поÑ?Ñ?е. Уколико Ñ?е опÑ?иÑ?а Ñ?кÑ?Ñ?Ñ?ена а заглавÑ?а наведена, пÑ?овеÑ?а Ñ?е биÑ?и бÑ?жа."
 
 #: ../mail/evolution-mail.schemas.in.h:38
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"УÑ?вÑ?Ñ?Ñ?Ñ?е да ли да коÑ?иÑ?Ñ?и иÑ?Ñ?и Ñ?онÑ? Ñ? поÑ?има â??ШаÑ?еâ?? and â??Темаâ?? Ñ? Ñ?Ñ?пÑ?авном "
-"погледÑ? колоне â??Ð?оÑ?Ñ?кеâ??."
+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:39
 msgid "Directory for loading/attaching files to composer."
@@ -13608,670 +12356,575 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ð?Ñ?азни Ñ?ве Ñ?аÑ?Ñ?икле Ñ?а Ñ?меÑ?ем пÑ?и заÑ?ваÑ?аÑ?Ñ? Ð?волÑ?Ñ?иÑ?е."
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgstr "Ð?могÑ?Ñ?ава анимиÑ?ане Ñ?лике Ñ? HTML поÑ?Ñ?и. Ð?ногим коÑ?иÑ?ниÑ?има Ñ?меÑ?аÑ?Ñ? анимиÑ?ане и Ñ?меÑ?Ñ?о Ñ?иÑ? желе непокÑ?еÑ?не Ñ?лике."
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Ð?могÑ?Ñ?ава пÑ?иказ кÑ?Ñ?зоÑ?а, Ñ?ако да видиÑ?е кÑ?Ñ?зоÑ? док Ñ?иÑ?аÑ?е поÑ?Ñ?кÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е или иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е магиÑ?нÑ? Ñ?азмакниÑ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+#| msgid "It disables/enables the prompt while marking multiple messages."
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е или иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?позоÑ?еÑ?е пÑ?и ознаÑ?аваÑ?Ñ? виÑ?е поÑ?Ñ?ка."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "УкÑ?Ñ?Ñ?и или иÑ?кÑ?Ñ?Ñ?и могÑ?Ñ?ноÑ?Ñ? Ñ?Ñ?ажеÑ?а кÑ?Ñ?аÑ?а Ñ? напÑ?ед"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "Ð?могÑ?Ñ?ава Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге пÑ?и покÑ?еÑ?аÑ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"УкÑ?Ñ?Ñ?и могÑ?Ñ?ноÑ?Ñ? пÑ?еÑ?Ñ?аге Ñ? боÑ?ноÑ? облаÑ?Ñ?и Ñ?ако да можеÑ?е покÑ?енÑ?Ñ?и "
-"инÑ?еÑ?акÑ?ивнÑ? пÑ?еÑ?Ñ?агÑ? кÑ?Ñ?аÑ?Ñ?Ñ?и Ñ? поÑ?е за Ñ?екÑ?Ñ?. Ð?оÑ?иÑ?Ñ? Ñ?е да можеÑ?е лако "
-"наÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ? Ñ?оÑ? боÑ?ноÑ? облаÑ?Ñ?и Ñ?амо кÑ?Ñ?аÑ?Ñ?Ñ?и име Ñ?аÑ?Ñ?икле и избоÑ? Ñ?каÑ?е "
-"аÑ?Ñ?омаÑ?Ñ?ки на Ñ?Ñ? Ñ?аÑ?Ñ?иклÑ?."
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgstr "Ð?могÑ?Ñ?ава пÑ?еÑ?Ñ?аживаÑ?е из боÑ?не Ñ?Ñ?аке, Ñ?Ñ?о доноÑ?и инÑ?еÑ?акÑ?ивноÑ?Ñ? Ñ? пÑ?еÑ?Ñ?ази назива Ñ?аÑ?Ñ?икли."
 
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"УкÑ?Ñ?Ñ?иÑ?е ово да би Ñ?азмакниÑ?ом помеÑ?али Ñ?екÑ?Ñ? поÑ?Ñ?ке пÑ?и пÑ?егледаÑ?Ñ?, као и "
-"Ñ?пиÑ?ак поÑ?Ñ?ка и Ñ?аÑ?Ñ?икли."
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "УкÑ?Ñ?Ñ?иÑ?е ово да би Ñ?азмакниÑ?ом помеÑ?али Ñ?екÑ?Ñ? поÑ?Ñ?ке пÑ?и пÑ?егледаÑ?Ñ?, као и Ñ?пиÑ?ак поÑ?Ñ?ка и Ñ?аÑ?Ñ?икли."
 
 # bug: unclear
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "УкÑ?Ñ?Ñ?иÑ?е да иÑ?Ñ?Ñ?Ñ?аваÑ?е Ñ?екÑ?Ñ?Ñ?ални део поÑ?Ñ?ке огÑ?аниÑ?ене велиÑ?ине."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
-msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е/иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е пÑ?иказ кÑ?Ñ?зоÑ?а"
+msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е/иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е пÑ?иказ кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
+msgstr "Ð?одиÑ?аÑ? називе даÑ?оÑ?ека на Outlook/GMail наÑ?ин"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+msgstr "Ð?одиÑ?а називе даÑ?оÑ?ека Ñ? заглавÑ?има поÑ?Ñ?е као Ñ?Ñ?о Ñ?о Ñ?аде Outlook или GMail, како би иÑ?пÑ?авно пÑ?иказали називе Ñ?а UTF-8 Ñ?ловима коÑ?е Ñ?аÑ?е Ð?волÑ?Ñ?иÑ?а, поÑ?Ñ?о Ñ?е не пÑ?идÑ?жаваÑ?Ñ? RFC 2231, него коÑ?иÑ?Ñ?е неиÑ?пÑ?аван Ñ?Ñ?андаÑ?д RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "Ð?иÑ?ина повÑ?Ñ?и лиÑ?Ñ?е поÑ?Ñ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Ð?иÑ?ина повÑ?Ñ?и лиÑ?Ñ?е поÑ?Ñ?ка."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "СкÑ?ива пÑ?еглед по Ñ?аÑ?Ñ?иклама и Ñ?клаÑ?а избоÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"Уколико коÑ?иÑ?ник покÑ?Ñ?а да оÑ?воÑ?и 10 или виÑ?е поÑ?Ñ?ка одÑ?едном, пиÑ?а га да ли "
-"заиÑ?Ñ?а жели Ñ?о да Ñ?Ñ?ади."
-
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Ako je â??Ð?Ñ?еглед поÑ?Ñ?кеâ?? повÑ?Ñ? Ñ?кÑ?Ñ?Ñ?ена, онда покажиÑ?е Ñ?е Ñ?еднÑ? до дÑ?Ñ?ге "
-"Ñ?адиÑ?е него Ñ?Ñ?пÑ?авно."
-
 #: ../mail/evolution-mail.schemas.in.h:63
-#, fuzzy
-msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"Уколико нема Ñ?гÑ?аÑ?еног пÑ?егледаÑ?а за оваÑ? mime Ñ?ип Ñ? оквиÑ?Ñ? Ð?волÑ?Ñ?иÑ?е, Ñ?ви "
-"mime Ñ?ипови Ñ?а ове лиÑ?Ñ?е коÑ?и Ñ?Ñ? везани bonobo пÑ?егледаÑ?ем делова Ñ? Ð?номовоÑ? "
-"бази mime Ñ?ипова могÑ? биÑ?и коÑ?иÑ?Ñ?ени за пÑ?иказ Ñ?адÑ?жаÑ?а."
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "Уколико коÑ?иÑ?ник покÑ?Ñ?а да оÑ?воÑ?и 10 или виÑ?е поÑ?Ñ?ка одÑ?едном, пиÑ?а га да ли заиÑ?Ñ?а жели Ñ?о да Ñ?Ñ?ади."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Ð?оÑ?еÑ?на виÑ?ина пÑ?озоÑ?а â??СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?еâ??. Ð?Ñ?едноÑ?Ñ? Ñ?е ажÑ?Ñ?иÑ?а Ñ?колико "
-"коÑ?иÑ?ник пÑ?одÑ?жи пÑ?озоÑ?."
+msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
+msgstr "Ð?ко Ñ?е повÑ?Ñ? â??Ð?Ñ?егледâ?? Ñ?кÑ?Ñ?Ñ?ена, онда Ñ?е пÑ?иказÑ?Ñ?е Ñ?еднÑ? до дÑ?Ñ?ге Ñ?адиÑ?е него Ñ?Ñ?пÑ?авно."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Ð?оÑ?еÑ?на велиÑ?ина Ñ?веÑ?аног пÑ?озоÑ?а â??СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?еâ??. Ð?Ñ?едноÑ?Ñ? Ñ?е "
-"ажÑ?Ñ?иÑ?а Ñ?колико коÑ?иÑ?ник Ñ?веÑ?а или Ñ?маÑ?и пÑ?озоÑ?. Ð?апомиÑ?емо да Ð?волÑ?Ñ?иÑ?а не "
-"коÑ?иÑ?Ñ?и овÑ? вÑ?едноÑ?Ñ? поÑ?Ñ?о оваÑ? пÑ?озоÑ? не може биÑ?и Ñ?веÑ?ан. Ð?ва Ñ?е вÑ?едноÑ?Ñ? "
-"Ñ?амо Ñ?поÑ?пÑ?Ñ?Ñ?Ñ?е поÑ?Ñ?авке."
+msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
+msgstr "Уколико Ñ? оквиÑ?Ñ? Ð?волÑ?Ñ?иÑ?е нема Ñ?гÑ?аÑ?еног пÑ?егледаÑ?а за оваÑ? MIME Ñ?ип, Ñ?ви MIME Ñ?ипови Ñ?а овог Ñ?пиÑ?ка коÑ?и Ñ?Ñ? везани за пÑ?егледаÑ? Bonobo делова Ñ? Ð?номовоÑ? бази MIME Ñ?ипова могÑ? биÑ?и коÑ?иÑ?Ñ?ени за пÑ?иказ Ñ?адÑ?жаÑ?а."
 
 #: ../mail/evolution-mail.schemas.in.h:66
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Ð?оÑ?еÑ?на Ñ?иÑ?ина пÑ?озоÑ?а â??СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?еâ??. Ð?Ñ?едноÑ?Ñ? Ñ?е ажÑ?Ñ?иÑ?а Ñ?колико "
-"коÑ?иÑ?ник пÑ?оÑ?иÑ?и пÑ?озоÑ?."
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+msgstr "Ð?оÑ?еÑ?на виÑ?ина пÑ?озоÑ?а â??СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?еâ??. Ð?Ñ?едноÑ?Ñ? Ñ?е ажÑ?Ñ?иÑ?а Ñ?колико коÑ?иÑ?ник пÑ?одÑ?жи пÑ?озоÑ?."
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "То Ñ?кÑ?Ñ?Ñ?Ñ?Ñ?е/иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?позоÑ?еÑ?е када ознаÑ?аваÑ?е виÑ?е поÑ?Ñ?ка."
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr "Ð?оÑ?еÑ?на велиÑ?ина Ñ?веÑ?аног пÑ?озоÑ?а â??СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?еâ??. Ð?Ñ?едноÑ?Ñ? Ñ?е ажÑ?Ñ?иÑ?а Ñ?колико коÑ?иÑ?ник Ñ?веÑ?а или Ñ?маÑ?и пÑ?озоÑ?. Ð?Ñ?имеÑ?иÑ?е да Ð?волÑ?Ñ?иÑ?а не коÑ?иÑ?Ñ?и овÑ? вÑ?едноÑ?Ñ? поÑ?Ñ?о оваÑ? пÑ?озоÑ? не може биÑ?и Ñ?веÑ?ан. Ð?ва вÑ?едноÑ?Ñ? Ñ?амо Ñ?поÑ?пÑ?Ñ?Ñ?Ñ?е поÑ?Ñ?авке."
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr ""
-"УкÑ?Ñ?Ñ?Ñ?Ñ?е/онемогÑ?Ñ?Ñ?Ñ?е Ñ?воÑ?Ñ?Ñ?во где Ñ?Ñ? поÑ?Ñ?ебни виÑ?еÑ?Ñ?Ñ?Ñ?ки Ñ?пиÑ?и за "
-"неопÑ?одноÑ?Ñ? Ñ?инÑ?Ñ?онизаÑ?иÑ?е ван мÑ?еже."
+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:69
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"УкÑ?Ñ?Ñ?Ñ?Ñ?е/иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е понавÑ?аÑ?е Ñ?позоÑ?еÑ?а да Ñ?е бÑ?иÑ?аÑ?е поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле "
-"пÑ?еÑ?Ñ?аге Ñ?Ñ?аÑ?но, а не Ñ?амо Ñ?клаÑ?аÑ?е из Ñ?езÑ?лÑ?аÑ?а пÑ?еÑ?Ñ?аге. "
+msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
+msgstr "Ð?могÑ?Ñ?ава/онемогÑ?Ñ?ава Ñ?воÑ?Ñ?Ñ?во где Ñ?Ñ? поÑ?Ñ?ебни виÑ?еÑ?Ñ?Ñ?Ñ?ки Ñ?пиÑ?и за неопÑ?одноÑ?Ñ? Ñ?инÑ?Ñ?онизаÑ?иÑ?е ван мÑ?еже."
 
 #: ../mail/evolution-mail.schemas.in.h:70
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr "Ð?могÑ?Ñ?ава/онемогÑ?Ñ?ава понавÑ?аÑ?е Ñ?позоÑ?еÑ?а да Ñ?е бÑ?иÑ?аÑ?е поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге Ñ?Ñ?аÑ?но, а не Ñ?амо Ñ?клаÑ?аÑ?е из Ñ?езÑ?лÑ?аÑ?а пÑ?еÑ?Ñ?аге. "
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Ð?оÑ?ледÑ?е вÑ?еме пÑ?ажÑ?еÑ?а Ñ?Ñ?бÑ?еÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Ð?оÑ?ледÑ?е вÑ?еме пÑ?ажÑ?еÑ?а Ñ?меÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "List of Labels and their associated colors"
-msgstr "Ð?иÑ?Ñ?а ознака и Ñ?има додеÑ?ениÑ? боÑ?а"
-
 #: ../mail/evolution-mail.schemas.in.h:74
-#, fuzzy
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Ð?иÑ?Ñ?а mime Ñ?ипова Ñ?ади пÑ?овеÑ?е за bonobo пÑ?егледаÑ?има"
+msgid "List of Labels and their associated colors"
+msgstr "СпиÑ?ак ознака и Ñ?има додеÑ?ениÑ? боÑ?а"
 
 #: ../mail/evolution-mail.schemas.in.h:75
-msgid "List of accepted licenses"
-msgstr "Ð?иÑ?Ñ?а пÑ?иÑ?ваÑ?ениÑ? лиÑ?енÑ?и"
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Ð?иÑ?Ñ?а MIME Ñ?ипова Ñ?ади пÑ?овеÑ?е за Bonobo пÑ?егледаÑ?има делова"
 
 #: ../mail/evolution-mail.schemas.in.h:76
-msgid "List of accounts"
-msgstr "Ð?иÑ?Ñ?а налога"
+msgid "List of accepted licenses"
+msgstr "СпиÑ?ак пÑ?иÑ?ваÑ?ениÑ? лиÑ?енÑ?и"
 
 #: ../mail/evolution-mail.schemas.in.h:77
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Ð?иÑ?Ñ?а налога коÑ?е познаÑ?е поÑ?Ñ?анÑ?ки део Ð?волÑ?Ñ?иÑ?е. Ð?иÑ?Ñ?а Ñ?адÑ?жи низове коÑ?е "
-"именÑ?Ñ?Ñ? поддиÑ?екÑ?оÑ?иÑ?Ñ?ме Ñ? одноÑ?Ñ? на /apps/evolution/mail/accounts."
+msgid "List of accounts"
+msgstr "СпиÑ?ак налога"
 
 #: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of custom headers and whether they are enabled."
-msgstr "Ð?иÑ?Ñ?а пÑ?илагоÑ?ениÑ? заглавÑ?а и да ли Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ена."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "СпиÑ?ак налога коÑ?е познаÑ?е поÑ?Ñ?анÑ?ки део Ð?волÑ?Ñ?иÑ?е. СпиÑ?ак Ñ?адÑ?жи низове коÑ?е именÑ?Ñ?Ñ? поддиÑ?екÑ?оÑ?иÑ?Ñ?ме Ñ? одноÑ?Ñ? на /apps/evolution/mail/accounts."
 
 #: ../mail/evolution-mail.schemas.in.h:79
-msgid "List of dictionary language codes used for spell checking."
-msgstr "СпиÑ?ак ознака Ñ?езика Ñ?еÑ?ника коÑ?и Ñ?е коÑ?иÑ?Ñ?е за пÑ?овеÑ?Ñ? пÑ?авопиÑ?а."
+msgid "List of custom headers and whether they are enabled."
+msgstr "СпиÑ?ак пÑ?илагоÑ?ениÑ? заглавÑ?а и да ли Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ена."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"Ð?иÑ?Ñ?а ознака коÑ?е познаÑ?е поÑ?Ñ?анÑ?ки део Ð?волÑ?Ñ?иÑ?е. Ð?иÑ?Ñ?а Ñ?адÑ?жи низове "
-"облика име:боÑ?а где боÑ?а коÑ?иÑ?Ñ?и HTML hex кодиÑ?аÑ?е."
+msgid "List of dictionary language codes used for spell checking."
+msgstr "СпиÑ?ак ознака Ñ?езика Ñ?еÑ?ника коÑ?и Ñ?е коÑ?иÑ?Ñ?е за пÑ?овеÑ?Ñ? пÑ?авопиÑ?а."
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid "List of protocol names whose license has been accepted."
-msgstr "Ð?иÑ?Ñ?а имена пÑ?оÑ?окола Ñ?иÑ?а Ñ?е лиÑ?енÑ?а пÑ?иÑ?ваÑ?ена."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "СпиÑ?ак ознака коÑ?е познаÑ?е поÑ?Ñ?анÑ?ки део Ð?волÑ?Ñ?иÑ?е. СпиÑ?ак Ñ?адÑ?жи низове облика име:боÑ?а где боÑ?а коÑ?иÑ?Ñ?и HTML hex кодиÑ?аÑ?е."
 
 #: ../mail/evolution-mail.schemas.in.h:82
-#, fuzzy
-msgid "Load images for HTML messages over HTTP"
-msgstr "УÑ?иÑ?ава Ñ?лике за HTML поÑ?Ñ?ке пÑ?еко http-а"
+msgid "List of protocol names whose license has been accepted."
+msgstr "СпиÑ?ак имена пÑ?оÑ?окола Ñ?иÑ?а Ñ?е лиÑ?енÑ?а пÑ?иÑ?ваÑ?ена."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-#, fuzzy
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"УÑ?иÑ?ава Ñ?лике за HTML поÑ?Ñ?ке пÑ?еко http(s)-а. Ð?огÑ?Ñ?е Ñ?Ñ? вÑ?едноÑ?Ñ?и: â??0â?? - "
-"никада не Ñ?Ñ?иÑ?аваÑ? Ñ?лике Ñ?а мÑ?еже. â??1â?? - Ñ?Ñ?иÑ?аваÑ? Ñ?лике Ñ?колико Ñ?е поÑ?иÑ?алаÑ? "
-"Ñ? именикÑ?. â??2â?? - Ñ?век Ñ?Ñ?иÑ?аваÑ? Ñ?лике Ñ?а мÑ?еже."
+msgid "Load images for HTML messages over HTTP"
+msgstr "УÑ?иÑ?ава Ñ?лике за HTML поÑ?Ñ?ке пÑ?еко HTTP-а"
 
 #: ../mail/evolution-mail.schemas.in.h:84
+msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "УÑ?иÑ?ава Ñ?лике за HTML поÑ?Ñ?ке пÑ?еко HTTP(S)-а. Ð?огÑ?Ñ?е Ñ?Ñ? вÑ?едноÑ?Ñ?и: â??0â?? - Ð?икада не Ñ?Ñ?иÑ?ава Ñ?лике Ñ?а мÑ?еже. â??1â?? - УÑ?иÑ?ава Ñ?лике из поÑ?Ñ?ка Ñ?колико Ñ?е поÑ?иÑ?алаÑ? Ñ? конÑ?акÑ?има. â??2â?? - Увек Ñ?Ñ?иÑ?ава Ñ?лике Ñ?а мÑ?еже."
+
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Ð?ележи Ñ?адÑ?е Ñ?илÑ?еÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Ð?ележи Ñ?адÑ?е Ñ?илÑ?еÑ?а Ñ? наведенÑ? даÑ?оÑ?екÑ? дневника."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Ð?невник даÑ?оÑ?ека за бележеÑ?е Ñ?адÑ?и Ñ?илÑ?еÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Ð?невник даÑ?оÑ?ека за бележеÑ?е Ñ?адÑ?и Ñ?илÑ?еÑ?а."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Ð?знаÑ?ава као виÑ?енÑ? поÑ?ле наведеног Ñ?ока"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Ð?знаÑ?ава као виÑ?енÑ? поÑ?ле наведеног Ñ?ока."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Ð?знаÑ?ава Ñ?иÑ?аÑ?е Ñ? пÑ?егледÑ? поÑ?Ñ?ке"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Ð?знаÑ?ава Ñ?иÑ?аÑ?е Ñ? пÑ?егледÑ? поÑ?Ñ?ке."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Ð?одÑ?азÑ?мевана виÑ?ина пÑ?озоÑ?а за поÑ?Ñ?кÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина пÑ?озоÑ?а за поÑ?Ñ?кÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"СÑ?ил пÑ?иказа поÑ?Ñ?ке ( â??normalâ?? за ноÑ?малан пÑ?иказ; â??full headersâ?? за пÑ?иказ "
-"Ñ?виÑ? заглавÑ?а; â??sourceâ?? за извоÑ?ни пÑ?иказ)"
+msgstr "СÑ?ил пÑ?иказа поÑ?Ñ?ке (â??normalâ?? за ноÑ?малан пÑ?иказ; â??full headersâ?? за пÑ?иказ Ñ?виÑ? заглавÑ?а; â??sourceâ?? за извоÑ?ни пÑ?иказ)"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Ð?аÑ?маÑ?е дана измеÑ?Ñ? пÑ?ажÑ?еÑ?а Ñ?Ñ?бÑ?еÑ?а на излазÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Ð?аÑ?маÑ?е дана измеÑ?Ñ? пÑ?ажÑ?еÑ?а Ñ?меÑ?а на излазÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Ð?аÑ?маÑ?е вÑ?еме измеÑ?Ñ? пÑ?ажÑ?еÑ?а Ñ?Ñ?бÑ?еÑ?а на излазÑ?, Ñ? данима."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Ð?аÑ?маÑ?е вÑ?еме измеÑ?Ñ? пÑ?ажÑ?еÑ?а Ñ?меÑ?а на излазÑ?, Ñ? данима."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Ð?Ñ?оÑ? адÑ?еÑ?а за пÑ?иказ Ñ? Ð?РÐ?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?"
+msgstr "Ð?Ñ?оÑ? адÑ?еÑ?а за пÑ?иказ Ñ? TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Ð?иÑ?а када Ñ?е наÑ?лов пÑ?азан"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ð?иÑ?а коÑ?иÑ?ника када покÑ?Ñ?а да иÑ?пÑ?азни Ñ?аÑ?Ñ?иклÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ð?иÑ?а коÑ?иÑ?ника када покÑ?Ñ?а да поÑ?аÑ?е поÑ?Ñ?кÑ? без наÑ?лова."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "ТÑ?ажи пÑ?овеÑ?Ñ? да ли коÑ?иÑ?ник жели одмаÑ? да Ñ?е иÑ?кÑ?Ñ?Ñ?и Ñ?а мÑ?еже"
+msgstr "ТÑ?ажи пÑ?овеÑ?Ñ? да ли коÑ?иÑ?ник жели одмаÑ? да Ñ?е иÑ?кÑ?Ñ?Ñ?и Ñ?а мÑ?еже"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "УпозоÑ?и код бÑ?иÑ?аÑ?а поÑ?Ñ?ка из Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Ð?иÑ?а пÑ?и пÑ?ажÑ?еÑ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Ð?иÑ?а када коÑ?иÑ?ник Ñ?неÑ?е Ñ?амо невидÑ?ивÑ? копиÑ?Ñ? (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Ð?иÑ?а коÑ?иÑ?ника када покÑ?Ñ?а да оÑ?воÑ?и 10 или виÑ?е поÑ?Ñ?ка одÑ?едном"
 
-#: ../mail/evolution-mail.schemas.in.h:108
-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:109
+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:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Ð?иÑ?а коÑ?иÑ?ника када покÑ?Ñ?а да поÑ?аÑ?е поÑ?Ñ?кÑ? без пÑ?ималаÑ?а."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ð?иÑ?а када коÑ?иÑ?ник покÑ?Ñ?а да поÑ?аÑ?е нежеÑ?ени HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Ð?иÑ?а пÑ?и ознаÑ?аваÑ?Ñ? виÑ?е поÑ?Ñ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr "Ð?оÑ?Ñ?ави пеÑ?Ñ?онализоване поÑ?пиÑ?е повÑ?Ñ? одговоÑ?а"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+#| msgid "Start _typing at the bottom on replying"
+msgid "Put the cursor at the bottom of replies"
+msgstr "Ð?оÑ?Ñ?авÑ?а кÑ?Ñ?Ñ?оÑ? на дно одговоÑ?а"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Ð?Ñ?епознаÑ?е емоÑ?иконе Ñ? Ñ?екÑ?Ñ?Ñ? и замеÑ?Ñ?Ñ?е иÑ? Ñ?ликама."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Ð?Ñ?епознаje везе Ñ? Ñ?екÑ?Ñ?Ñ? и замеÑ?Ñ?Ñ?е иÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "Ð?Ñ?овеÑ?ава да ли има Ñ?Ñ?бÑ?еÑ?а Ñ? долазноÑ? поÑ?Ñ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "СаÑ?Ñ?ваÑ? диÑ?екÑ?оÑ?иÑ?Ñ?м"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "ТÑ?ажи Ñ?ликÑ? поÑ?иÑ?аоÑ?а Ñ? локалним адÑ?еÑ?аÑ?има"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Ð?одÑ?азÑ?мевано Ñ?аÑ?и поÑ?Ñ?Ñ? као HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Ð?одÑ?азÑ?мевано Ñ?аÑ?е поÑ?Ñ?Ñ? као HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "Ð?Ñ?иказÑ?Ñ?е колонÑ? Ñ?а е-адÑ?еÑ?ама  Ñ? Ñ?пиÑ?кÑ? поÑ?Ñ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "Ð?нÑ?еÑ?вал Ñ?инÑ?Ñ?онизаÑ?иÑ?е Ñ?а Ñ?еÑ?веÑ?ом"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Ð?Ñ?икажи поÑ?е â??Bccâ?? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?ке"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Ð?Ñ?икажи поÑ?е â??Ccâ?? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?ке"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Ð?Ñ?икажи поÑ?е â??ШаÑ?еâ?? пÑ?и Ñ?лаÑ?Ñ? на допиÑ?нÑ? лиÑ?Ñ?Ñ?"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "Ð?Ñ?икажи поÑ?е â??ШаÑ?еâ?? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?ке"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Ð?Ñ?икажи поÑ?е â??Ð?дговоÑ? заâ?? пÑ?и Ñ?лаÑ?Ñ? на допиÑ?нÑ? лиÑ?Ñ?Ñ?"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+#| msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??Ð?дговоÑ? заâ?? када Ñ?аÑ?е поÑ?Ñ?кÑ?"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Ð?Ñ?икажи анимаÑ?иÑ?е"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "Ð?Ñ?иказÑ?Ñ?е анимиÑ?ане Ñ?лике као анимаÑ?иÑ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Ð?Ñ?иказÑ?Ñ?е обÑ?иÑ?ане поÑ?Ñ?ке (као пÑ?еÑ?Ñ?Ñ?ане) Ñ? лиÑ?Ñ?и поÑ?Ñ?ка."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "Ð?Ñ?икажи обÑ?иÑ?ане поÑ?Ñ?ке Ñ? лиÑ?Ñ?и поÑ?Ñ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+#| msgid "_Show image animations"
+msgid "Show image animations"
+msgstr "Ð?Ñ?иказÑ?Ñ?е анимиÑ?ане Ñ?лике"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "Ð?Ñ?икаÑ?Ñ?Ñ?е Ñ?ликÑ? поÑ?иÑ?аоÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??Bccâ?? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?ке. Ð?во Ñ?е поÑ?Ñ?авÑ?а из мениÑ?а â??Ð?Ñ?егледâ?? након избоÑ?а налога поÑ?Ñ?е."
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??Bccâ?? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?ке. Ð?во Ñ?е поÑ?Ñ?авÑ?а из мениÑ?а â??Ð?Ñ?егледâ?? након избоÑ?а налога поÑ?Ñ?е."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??ШаÑ?еâ?? пÑ?и Ñ?лаÑ?Ñ? на допиÑ?нÑ? лиÑ?Ñ?Ñ?. Ð?во Ñ?е поÑ?Ñ?авÑ?а из мениÑ?а â??Ð?Ñ?егледâ?? након избоÑ?а налога допиÑ?не лиÑ?Ñ?е."
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??ШаÑ?еâ?? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?ке. Ð?во Ñ?е поÑ?Ñ?авÑ?а из мениÑ?а â??Ð?Ñ?егледâ?? након избоÑ?а налога поÑ?Ñ?е."
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??Ð?дговоÑ? заâ?? пÑ?и Ñ?лаÑ?Ñ? на допиÑ?нÑ? лиÑ?Ñ?Ñ?. Ð?во Ñ?е поÑ?Ñ?авÑ?а из мениÑ?а â??Ð?Ñ?егледâ?? након избоÑ?а налога допиÑ?не лиÑ?Ñ?е."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?е â??Ð?дговоÑ? заâ?? пÑ?и Ñ?лаÑ?Ñ? на поÑ?Ñ?ке. Ð?во Ñ?е поÑ?Ñ?авÑ?а из мениÑ?а â??Ð?Ñ?егледâ?? након избоÑ?а налога налога поÑ?Ñ?е."
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Ð?Ñ?иказÑ?Ñ?е е-адÑ?еÑ?Ñ? поÑ?иÑ?аоÑ?а Ñ? поÑ?ебноÑ? колони Ñ? Ñ?пиÑ?кÑ? поÑ?Ñ?ка."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Ð?Ñ?иказÑ?Ñ?е Ñ?ликÑ? поÑ?иÑ?аоÑ?а Ñ? окнÑ? за Ñ?иÑ?аÑ?е поÑ?Ñ?ке."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Ð?Ñ?овеÑ?а пÑ?авопиÑ?а Ñ?нÑ?Ñ?аÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "Ð?оÑ?а за пÑ?овеÑ?Ñ? пÑ?авопиÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "Ð?езиÑ?и за пÑ?овеÑ?Ñ? пÑ?авопиÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Ð?одÑ?азÑ?мевана виÑ?ина пÑ?озоÑ?а за пÑ?иÑ?авÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина пÑ?озоÑ?а за пÑ?иÑ?авÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
-msgstr "Словни лик Ñ?еÑ?минала"
+msgstr "ФонÑ? Ñ?еÑ?минала"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Ð?гÑ?аниÑ?еÑ?е Ñ?екÑ?Ñ?Ñ?алног дела поÑ?Ñ?ке"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "Ð?одÑ?азÑ?мевани додаÑ?ак кÑ?ке за Ñ?Ñ?бÑ?е"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Ð?оÑ?ледÑ?е вÑ?еме пÑ?ажÑ?еÑ?а Ñ?Ñ?бÑ?еÑ?а, Ñ? данима од поÑ?еÑ?ка епоÑ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Ð?Ñ?еме пÑ?ажÑ?еÑ?а Ñ?меÑ?а, Ñ? данима од поÑ?еÑ?ка епоÑ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "ФонÑ? Ñ?еÑ?минала за пÑ?иказ поÑ?Ñ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "ФонÑ? пÑ?оменÑ?иве велиÑ?ине за пÑ?иказ поÑ?Ñ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Ð?оже имаÑ?и Ñ?Ñ?и могÑ?Ñ?е вÑ?едноÑ?Ñ?и. â??0â?? за гÑ?еÑ?ке. â??1â?? за Ñ?позоÑ?еÑ?а. â??2â?? за "
-"поÑ?Ñ?ке о диÑ?агнози кваÑ?а."
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+msgstr "Ð?оже имаÑ?и Ñ?Ñ?и могÑ?Ñ?е вÑ?едноÑ?Ñ?и. â??0â?? за гÑ?еÑ?ке. â??1â?? за Ñ?позоÑ?еÑ?а. â??2â?? за поÑ?Ñ?ке о диÑ?агнози кваÑ?а."
 
 # bug: s/interms/in terms/ (space)
-#: ../mail/evolution-mail.schemas.in.h:143
-#, 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."
-msgstr ""
-"Ð?во одÑ?еÑ?Ñ?Ñ?е наÑ?веÑ?Ñ? велиÑ?инÑ? Ñ?екÑ?Ñ?Ñ?алног дела коÑ?и Ñ?е може иÑ?Ñ?Ñ?Ñ?аÑ?и Ñ? "
-"Ð?волÑ?Ñ?иÑ?и. Ð?одÑ?азÑ?мева Ñ?е 4MB/4096 KB и наведено Ñ?е као бÑ?оÑ? KB."
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr "Ð?во одÑ?еÑ?Ñ?Ñ?е наÑ?веÑ?Ñ? велиÑ?инÑ? Ñ?екÑ?Ñ?Ñ?алног дела коÑ?и може биÑ?и Ñ?оÑ?маÑ?иÑ?ан Ñ? Ð?волÑ?Ñ?иÑ?и. Ð?одÑ?азÑ?мевано Ñ?е 4MB / 4096 KB и наведено Ñ?е као бÑ?оÑ? KB."
 
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"Ð?во Ñ?е подÑ?азÑ?мевани додаÑ?ак кÑ?ке за Ñ?Ñ?бÑ?е, Ñ?ак и ако Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ени виÑ?еÑ?Ñ?Ñ?Ñ?ки "
-"додаÑ?и. Уколико Ñ?е поменÑ?Ñ?и подÑ?азÑ?мевани додаÑ?ак иÑ?кÑ?Ñ?Ñ?ен, пÑ?еоÑ?Ñ?али "
-"доÑ?Ñ?Ñ?пни додаÑ?и неÑ?е биÑ?и акÑ?ивиÑ?ани."
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+msgstr "Ð?во Ñ?е подÑ?азÑ?мевани додаÑ?ак кÑ?ке за Ñ?Ñ?бÑ?е, Ñ?ак и ако Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ени виÑ?еÑ?Ñ?Ñ?Ñ?ки пÑ?икÑ?Ñ?Ñ?Ñ?и. Уколико Ñ?е поменÑ?Ñ?и подÑ?азÑ?мевани пÑ?икÑ?Ñ?Ñ?ак иÑ?кÑ?Ñ?Ñ?ен, пÑ?еоÑ?Ñ?али доÑ?Ñ?Ñ?пни пÑ?икÑ?Ñ?Ñ?Ñ?и неÑ?е биÑ?и акÑ?ивиÑ?ани."
 
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-msgstr ""
-"Ð?вак кÑ?Ñ?Ñ? Ñ?е пÑ?оÑ?иÑ?ан Ñ?едном и поÑ?ом вÑ?аÑ?ен на â??falseâ?? (неÑ?аÑ?но). Ð?во Ñ?клаÑ?а "
-"поÑ?Ñ?Ñ? Ñ?а Ñ?пиÑ?ка и пÑ?еглед за Ñ?Ñ? Ñ?аÑ?Ñ?иклÑ?."
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+msgstr "Ð?вак кÑ?Ñ?Ñ? Ñ?е пÑ?оÑ?иÑ?ан Ñ?едном и поÑ?ом вÑ?аÑ?ен на â??falseâ?? (неÑ?аÑ?но). Ð?во Ñ?клаÑ?а поÑ?Ñ?Ñ? Ñ?а Ñ?пиÑ?ка и пÑ?еглед за Ñ?Ñ? Ñ?аÑ?Ñ?иклÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"Ð?ваÑ? кÑ?Ñ?Ñ? Ñ?Ñ?еба да Ñ?адÑ?жи лиÑ?Ñ?Ñ? XML Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?а за навоÑ?еÑ?е пÑ?илагоÑ?ениÑ? "
-"заглавÑ?а и поÑ?Ñ?ебÑ? Ñ?иÑ?овог пÑ?иказиваÑ?а. XML Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?а Ñ?е Ñ?оÑ?маÑ?а &lt;header "
-"enabled&gt; - омогÑ?Ñ?ено за пÑ?иказиваÑ?е заглавÑ?а Ñ? пÑ?егледÑ? поÑ?Ñ?е."
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "Ð?ваÑ? кÑ?Ñ?Ñ? Ñ?Ñ?еба да Ñ?адÑ?жи лиÑ?Ñ?Ñ? XML Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?а за навоÑ?еÑ?е пÑ?илагоÑ?ениÑ? заглавÑ?а и поÑ?Ñ?ебÑ? Ñ?иÑ?овог пÑ?иказиваÑ?а. XML Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?а Ñ?е Ñ?оÑ?маÑ?а &lt;header enabled&gt; - омогÑ?Ñ?ено за пÑ?иказиваÑ?е заглавÑ?а Ñ? пÑ?егледÑ? поÑ?Ñ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"Ð?ва опÑ?иÑ?а Ñ?е одноÑ?и на кÑ?Ñ?Ñ? lookup_addressbook и коÑ?иÑ?Ñ?и Ñ?е за одÑ?еÑ?иваÑ?е "
-"да ли да Ñ?е адÑ?еÑ?а Ñ?Ñ?ажи Ñ?амо Ñ? локалном адÑ?еÑ?аÑ?Ñ? како би Ñ?е издвоÑ?ила поÑ?Ñ?а "
-"пÑ?имÑ?ена од познаÑ?иÑ? поÑ?иÑ?алаÑ?а од оне нежеÑ?ене."
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
+msgstr "Ð?ва опÑ?иÑ?а Ñ?е одноÑ?и на кÑ?Ñ?Ñ? lookup_addressbook и коÑ?иÑ?Ñ?и Ñ?е за одÑ?еÑ?иваÑ?е да ли да Ñ?е адÑ?еÑ?а Ñ?Ñ?ажи Ñ?амо Ñ? локалном адÑ?еÑ?аÑ?Ñ? како би Ñ?е издвоÑ?ила поÑ?Ñ?а пÑ?имÑ?ена од познаÑ?иÑ? поÑ?иÑ?алаÑ?а од оне нежеÑ?ене."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ð?ва Ñ?е опÑ?иÑ?а пÑ?ипомоÑ?и бÑ?зини пÑ?ибавÑ?аÑ?а поÑ?Ñ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Ð?во подеÑ?ава бÑ?оÑ? адÑ?еÑ?а за пÑ?иказ Ñ? подÑ?азÑ?меваном пÑ?егледÑ? Ñ?пиÑ?ка поÑ?Ñ?ка, "
-"поÑ?ле Ñ?ега Ñ?е â??...â?? пÑ?иказано."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+msgstr "Ð?во подеÑ?ава бÑ?оÑ? адÑ?еÑ?а за пÑ?иказ Ñ? подÑ?азÑ?меваном пÑ?егледÑ? Ñ?пиÑ?ка поÑ?Ñ?ка, поÑ?ле Ñ?ега Ñ?е â??...â?? пÑ?иказано."
 
-#: ../mail/evolution-mail.schemas.in.h:150
-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:166
+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:151
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Ð?во подеÑ?аваÑ?е одÑ?еÑ?Ñ?Ñ?е да ли Ñ?е низови биÑ?и Ñ?азвÑ?Ñ?Ñ?ани по поÑ?ледÑ?оÑ? поÑ?Ñ?Ñ?и "
-"Ñ?едног низа, Ñ?меÑ?Ñ?о по даÑ?Ñ?мÑ?. Ð?волÑ?Ñ?иÑ?а заÑ?Ñ?ева поновно покÑ?еÑ?аÑ?е."
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+msgstr "Ð?во подеÑ?аваÑ?е одÑ?еÑ?Ñ?Ñ?е да ли Ñ?е низови биÑ?и Ñ?азвÑ?Ñ?Ñ?ани по поÑ?ледÑ?оÑ? поÑ?Ñ?Ñ?и Ñ?едног низа, Ñ?меÑ?Ñ?о по даÑ?Ñ?мÑ?. Ð?волÑ?Ñ?иÑ?а заÑ?Ñ?ева поновно покÑ?еÑ?аÑ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "РазвÑ?Ñ?Ñ?ава Ñ?пиÑ?ак поÑ?Ñ?ка по Ñ?аÑ?пÑ?авама."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "РазвÑ?Ñ?Ñ?аÑ? поÑ?Ñ?ке по Ñ?аÑ?пÑ?авама"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "Ð?Ñ?икажи поÑ?Ñ?ке пÑ?ема наÑ?ловÑ? Ñ?аÑ?пÑ?аве"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Ð?Ñ?еме за ознаÑ?аваÑ?е поÑ?Ñ?ке као виÑ?ене"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Ð?Ñ?еме за ознаÑ?аваÑ?е поÑ?Ñ?ке као виÑ?ене."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "Ð?Ð?Ð? низ подÑ?азÑ?меваног налога."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Ð?оÑ?а за подвлаÑ?еÑ?е пÑ?авопиÑ?ниÑ? гÑ?еÑ?ки пÑ?иликом пÑ?овеÑ?е пÑ?авопиÑ?а."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?еÑ?виÑ? и клиÑ?енÑ?а УбиÑ?е Ñ?пама"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Ð?оÑ?иÑ?Ñ?и демона и клиÑ?енÑ?а УбиÑ?е Ñ?пама (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
-msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?опÑ?Ñ?вени Ñ?ловни лик"
+msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?опÑ?Ñ?вене Ñ?онÑ?ове"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
-msgstr "Ð?оÑ?иÑ?Ñ?и пÑ?илагоÑ?ени Ñ?онÑ? за пÑ?иказ поÑ?Ñ?е."
+msgstr "Ð?оÑ?иÑ?Ñ?и пÑ?илагоÑ?ене Ñ?онÑ?ове за пÑ?иказ поÑ?Ñ?е."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?амо локалне пÑ?овеÑ?е Ñ?пама."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?амо локалне пÑ?овеÑ?е Ñ?пама (без DNS-а)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "Ð?оÑ?иÑ?Ñ?иÑ?е Ñ?едан до дÑ?Ñ?гог или Ñ?иÑ?оки Ñ?аÑ?поÑ?ед"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "Словни лик пÑ?оменÑ?иве велиÑ?ине"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/невидÑ?ива копиÑ?а (Bcc) Ñ?е изабÑ?ана"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/невидÑ?ива копиÑ?а (Bcc) Ñ?е изабÑ?ана."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/копиÑ?а (Cc) Ñ?е изабÑ?ана"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/копиÑ?а (Cc) Ñ?е изабÑ?ана."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/Ñ?аÑ?е Ñ?е изабÑ?ана"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/Ñ?аÑ?е Ñ?е изабÑ?ана."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/пÑ?има Ñ?е изабÑ?ана"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/поÑ?аÑ?и Ñ?е изабÑ?ана."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgstr "Ð?оÑ?иÑ?ниÑ?има Ñ?е миÑ?Ñ?еÑ?е Ñ?азликÑ?Ñ?е где би Ñ?Ñ?ебало кÑ?Ñ?Ñ?оÑ? да бÑ?де када Ñ?е одговаÑ?а на поÑ?Ñ?кÑ?. Ð?во Ñ?Ñ?вÑ?Ñ?Ñ?Ñ?е да ли Ñ?е биÑ?и поÑ?Ñ?авÑ?ен на вÑ?Ñ? или на дно поÑ?Ñ?ке."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/одговоÑ? Ñ?е изабÑ?ана"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+msgstr "Ð?оÑ?иÑ?ниÑ?има Ñ?е миÑ?Ñ?еÑ?е Ñ?азликÑ?Ñ?е где би Ñ?Ñ?ебало поÑ?пиÑ? да бÑ?де када Ñ?е одговаÑ?а на поÑ?Ñ?кÑ?. Ð?во Ñ?Ñ?вÑ?Ñ?Ñ?Ñ?е да ли Ñ?е биÑ?и поÑ?Ñ?авÑ?ен на вÑ?Ñ? или на дно поÑ?Ñ?ке."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/одговоÑ? Ñ?е изабÑ?ана."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "ФонÑ? пÑ?оменÑ?иве велиÑ?ине"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ð?а ли Ñ?е повÑ?аÑ?ниÑ?а подÑ?азÑ?мевано додаÑ?е Ñ?вакоÑ? поÑ?Ñ?Ñ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:178
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "Ð?а ли Ñ?е иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?кÑ?аÑ?иваÑ?е назива Ñ?аÑ?Ñ?икли Ñ? Ñ?Ñ?аблÑ?."
+msgstr "Ð?а ли да онемогÑ?Ñ?и опÑ?иÑ?Ñ? Ñ?кÑ?аÑ?иваÑ?а назива Ñ?аÑ?Ñ?икли Ñ? боÑ?ноÑ? Ñ?Ñ?аÑ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Ð?а ли покÑ?Ñ?аÑ?и пÑ?иказ низа Ñ?аÑ?пÑ?аве по наÑ?ловÑ? када поÑ?Ñ?ке не Ñ?адÑ?же "
-"заглавÑ?а â??In-Reply-Toâ?? или â??Referencesâ??."
+#: ../mail/evolution-mail.schemas.in.h:187
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "Ð?а ли покÑ?Ñ?аÑ?и пÑ?иказ Ñ?аÑ?пÑ?аве по наÑ?ловÑ? када поÑ?Ñ?ке не Ñ?адÑ?же заглавÑ?а In-Reply-To или References."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
-msgstr "Ð?а ли Ñ?е поÑ?Ñ?ке нижÑ? на оÑ?новÑ? поÑ?ледÑ?е поÑ?Ñ?ке Ñ? низÑ?"
+msgstr "Ð?а ли Ñ?е поÑ?Ñ?ке нижÑ? на оÑ?новÑ? поÑ?ледÑ?е поÑ?Ñ?ке Ñ? Ñ?аÑ?пÑ?ави"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
-msgstr "ШиÑ?ина повÑ?Ñ?и лиÑ?Ñ?е поÑ?Ñ?ка"
+msgstr "ШиÑ?ина повÑ?Ñ?и Ñ?пиÑ?ка поÑ?Ñ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
-msgstr "ШиÑ?ина повÑ?Ñ?и лиÑ?Ñ?е поÑ?Ñ?ка."
+msgstr "ШиÑ?ина повÑ?Ñ?и Ñ?пиÑ?ка поÑ?Ñ?ка."
 
 #: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
@@ -14286,12 +12939,12 @@ msgid "Import mail from Elm."
 msgstr "Ð?ажна поÑ?Ñ?а из пÑ?огÑ?ама Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Ð?дÑ?едиÑ?на Ñ?аÑ?Ñ?икла:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ? за Ñ?воз"
 
@@ -14309,11 +12962,12 @@ msgstr "УвожеÑ?е поÑ?Ñ?анÑ?ког Ñ?андÑ?Ñ?еÑ?а"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560
+#: ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
-msgstr "УвожеÑ?е â??%sâ??"
+msgstr "УвожеÑ?е â??%sâ??"
 
 #: ../mail/importers/mail-importer.c:371
 #, c-format
@@ -14337,26 +12991,27 @@ msgstr "Увози поÑ?Ñ?Ñ? из пÑ?огÑ?ама Pine."
 msgid "Mail to %s"
 msgstr "Ð?оÑ?Ñ?а за %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235
+#: ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Ð?оÑ?Ñ?а од %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Ð?аÑ?лов Ñ?е %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s допиÑ?на лиÑ?Ñ?а"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Ð?одаÑ? пÑ?авило Ñ?илÑ?Ñ?иÑ?аÑ?а"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -14364,7 +13019,7 @@ msgstr[0] "%d изабÑ?ана,"
 msgstr[1] "%d изабÑ?ане,"
 msgstr[2] "%d изабÑ?аниÑ?,"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -14372,7 +13027,7 @@ msgstr[0] "%d обÑ?иÑ?ано"
 msgstr[1] "%d обÑ?иÑ?ане"
 msgstr[2] "%d обÑ?иÑ?аниÑ?"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -14380,15 +13035,15 @@ msgstr[0] "%d Ñ?Ñ?бÑ?е"
 msgstr[1] "%d Ñ?Ñ?бÑ?еÑ?а"
 msgstr[2] "%d Ñ?Ñ?бÑ?еÑ?а"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "%d Ñ? пÑ?ипÑ?еми"
-msgstr[1] "%d Ñ? пÑ?ипÑ?еми"
-msgstr[2] "%d Ñ? пÑ?ипÑ?еми"
+msgstr[0] "%d наÑ?Ñ?Ñ?"
+msgstr[1] "%d наÑ?Ñ?Ñ?а"
+msgstr[2] "%d наÑ?Ñ?Ñ?а"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14396,7 +13051,7 @@ msgstr[0] "%d поÑ?лаÑ?о"
 msgstr[1] "%d поÑ?лаÑ?е"
 msgstr[2] "%d поÑ?лаÑ?иÑ?"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -14404,7 +13059,7 @@ msgstr[0] "%d непоÑ?лаÑ?о"
 msgstr[1] "%d непоÑ?лаÑ?е"
 msgstr[2] "%d непоÑ?лаÑ?иÑ?"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -14412,7 +13067,7 @@ msgstr[0] "%d непÑ?оÑ?иÑ?ана,"
 msgstr[1] "%d непÑ?оÑ?иÑ?ане,"
 msgstr[2] "%d непÑ?оÑ?иÑ?аниÑ?,"
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14420,77 +13075,73 @@ msgstr[0] "%d Ñ?кÑ?пно"
 msgstr[1] "%d Ñ?кÑ?пно"
 msgstr[2] "%d Ñ?кÑ?пно"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Ð?ова поÑ?Ñ?ка"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Ð?оÑ?Ñ?ка"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "СаÑ?Ñ?ави новÑ? поÑ?Ñ?кÑ?"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Ð?ова Ñ?аÑ?Ñ?икла за поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_ФаÑ?Ñ?икла за поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Ð?апÑ?ави новÑ? Ñ?аÑ?Ñ?иклÑ? за поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Ð?еÑ?Ñ?пела надогÑ?адÑ?а подеÑ?аваÑ?а поÑ?Ñ?е или Ñ?аÑ?Ñ?икли."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " _Ð?Ñ?овеÑ?и подÑ?жане Ñ?ипове "
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Ð?апомена: заÑ?Ñ?ева поновно покÑ?еÑ?аÑ?е пÑ?огÑ?ама)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ниÑ?е подÑ?жан Ñ? овоÑ? веÑ?зиÑ?и Ð?волÑ?Ñ?иÑ?е</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>ФоÑ?огÑ?аÑ?иÑ?а поÑ?иÑ?аоÑ?а</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Ð?о_Ñ?пиÑ?и</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Ð?пÑ?иÑ?а за пÑ?иказ пÑ?ве поÑ?Ñ?ке</b> (не пÑ?епоÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?е)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Ð?езиÑ?и</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Ð?одаÑ?и о налогÑ?</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?а</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">СаÑ?Ñ?авÑ?аÑ?е поÑ?Ñ?ка</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Ð?одеÑ?аваÑ?е</span>"
 
@@ -14524,7 +13175,7 @@ msgstr "<span weight=\"bold\">Словни лик за поÑ?Ñ?ке</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Ð?Ñ?изнаниÑ?е</span>"
+msgstr "<span weight=\"bold\">Ð?овÑ?аÑ?ниÑ?е</span>"
 
 #: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
@@ -14541,11 +13192,11 @@ msgstr "<span weight=\"bold\">Ð?Ñ?илиÑ?но добÑ?а пÑ?иваÑ?ноÑ?Ñ? (
 
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Словни лик за Ñ?Ñ?ампÑ?</span>"
+msgstr "<span weight=\"bold\">ФонÑ?ови за Ñ?Ñ?ампÑ?</span>"
 
 #: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">Ð?одеÑ?аваÑ?а поÑ?Ñ?едника</span>"
+msgstr "<span weight=\"bold\">Ð?оÑ?Ñ?авке поÑ?Ñ?едника</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -14561,7 +13212,7 @@ msgstr "<span weight=\"bold\">СигÑ?Ñ?ноÑ?Ñ?</span>"
 
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Ð?оÑ?лаÑ?е и поÑ?Ñ?ке Ñ? пÑ?ипÑ?еми</span>"
+msgstr "<span weight=\"bold\">Ð?оÑ?лаÑ?е поÑ?Ñ?ке и наÑ?Ñ?Ñ?и</span>"
 
 #: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
@@ -14609,61 +13260,85 @@ msgstr "Ув_ек Ñ?иÑ?Ñ?Ñ?Ñ? и мени пÑ?и Ñ?лаÑ?Ñ? Ñ?иÑ?Ñ?оване
 
 #: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
-msgstr "Увек Ñ?Ñ?ажи пÑ?изнаниÑ?Ñ?"
+msgstr "Увек Ñ?Ñ?ажи повÑ?аÑ?ниÑ?Ñ?"
+
+#: ../mail/mail-config.glade.h:45
+#| msgid "Attachment Reminder"
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Ð?Ñ?илог\n"
+"УгÑ?еждено\n"
+"ЦиÑ?иÑ?ано"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"Ð?Ñ?илог\n"
+"УгÑ?ежден (Outlook Ñ?Ñ?ил)\n"
+"ЦиÑ?иÑ?ан\n"
+"Ð?ез Ñ?иÑ?аÑ?а"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "Увек Ñ?меÑ?ни Ñ?лике _емоÑ?икона"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "Ð?алÑ?иÑ?ки (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "Ð?алÑ?иÑ?ки (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "Ð?_одна Ñ?Ñ?Ñ?ана:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "_Ð?Ñ?овеÑ?и подÑ?жане Ñ?ипове "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr "_Ð?Ñ?овеÑ?и подÑ?жане Ñ?ипове"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
-msgstr "Ð?Ñ?овеÑ?и има ли нежеÑ?ене поÑ?Ñ?е Ñ? _пÑ?илагоÑ?еним заглавÑ?има"
+msgstr "Ð?Ñ?овеÑ?и има ли Ñ?Ñ?бÑ?еÑ?а Ñ? _пÑ?илагоÑ?еним заглавÑ?има"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
-msgstr "Ð?Ñ?овеÑ?и има ли нежеÑ?еног Ñ? _пÑ?иÑ?Ñ?иглоÑ? поÑ?Ñ?и"
+msgstr "Ð?Ñ?овеÑ?и има ли Ñ?Ñ?бÑ?еÑ?а Ñ? _пÑ?иÑ?Ñ?иглоÑ? поÑ?Ñ?и"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Ð?Ñ?овеÑ?и пÑ?авопиÑ? док _кÑ?Ñ?ам"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ð?Ñ?овеÑ?и да пÑ?иÑ?Ñ?игле поÑ?Ñ?ке ниÑ?Ñ? Ñ?Ñ?бÑ?е"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "Ð?Ñ?и_Ñ?Ñ?и"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Ð?Ñ?иÑ?_Ñ?и"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "Ð?оÑ?а за _погÑ?еÑ?но напиÑ?ане Ñ?еÑ?и:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "_Ð?оÑ?вÑ?ди када пÑ?азниÑ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14677,337 +13352,300 @@ msgstr ""
 "Сада Ñ?Ñ?е Ñ?пÑ?емни да Ñ?аÑ?еÑ?е и пÑ?имаÑ?е поÑ?Ñ?Ñ? \n"
 "коÑ?иÑ?Ñ?еÑ?ем Ð?волÑ?Ñ?иÑ?е. \n"
 "\n"
-"Ð?ликниÑ?е â??Ð?Ñ?имениâ?? да Ñ?аÑ?Ñ?ваÑ?е подеÑ?аваÑ?а."
+"Ð?ликниÑ?е â??Ð?Ñ?имениâ?? да Ñ?аÑ?Ñ?ваÑ?е поÑ?Ñ?авке."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "Ð?од_Ñ?азÑ?мевано"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "Ð?одÑ?азÑ?меванa _кодна Ñ?Ñ?Ñ?ана:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
-msgstr "Ð?бÑ?иÑ?и нежеÑ?енÑ? поÑ?Ñ?Ñ? пÑ?и и_злазÑ?"
+msgstr "Ð?бÑ?иÑ?и Ñ?Ñ?бÑ?е пÑ?и и_злазÑ?"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ð?игиÑ?ално поÑ?пиÑ?и од_лазне поÑ?Ñ?ке (подÑ?азÑ?мевано)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ð?е Ñ?оÑ?маÑ?иÑ?аÑ? поÑ?Ñ?ке када велиÑ?и_на пÑ?еÑ?е"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "Ð?е ознаÑ?ава_Ñ? поÑ?Ñ?ке као нежеÑ?ене ако Ñ?е поÑ?иÑ?алаÑ? Ñ? мом адÑ?еÑ?аÑ?Ñ?"
-
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "Ð?е Ñ?иÑ?иÑ?аÑ?"
+msgstr "Ð?е ознаÑ?ава_Ñ? поÑ?Ñ?ке као Ñ?Ñ?бÑ?е ако Ñ?е поÑ?иÑ?алаÑ? Ñ? мом адÑ?еÑ?аÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Ð?оÑ?ово"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
-msgstr "_ФаÑ?Ñ?икла Ð?Ñ?ипÑ?ема:"
+msgstr "_ФаÑ?Ñ?икла Ð?аÑ?Ñ?Ñ?и:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "Ð?алози е-поÑ?Ñ?е"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "Ð?лекÑ?Ñ?онÑ?ка _адÑ?еÑ?а:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Ð?Ñ?пÑ?азни Ñ?аÑ?Ñ?икле Ñ?а _Ñ?меÑ?ем на излазÑ?"
 
-#: ../mail/mail-config.glade.h:79
-#, fuzzy
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
-msgstr "УкÑ?Ñ?Ñ?и Ð?агиÑ?нÑ? Ñ?азмак_ниÑ?Ñ?"
+msgstr "Ð?могÑ?Ñ?ава Ð?агиÑ?нÑ? Ñ?азмак_ниÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "УкÑ?Ñ?Ñ?и Ñ?аÑ?Ñ?икле пÑ?еÑ?_Ñ?аге"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? за Ñ?и_Ñ?Ñ?оваÑ?е:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "_ШиÑ?Ñ?Ñ?Ñ? одлазеÑ?е поÑ?Ñ?ке (подÑ?азÑ?мевано)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
-msgstr "УÑ?вÑ?Ñ?ене-пиÑ?ине:"
+msgstr "УÑ?вÑ?Ñ?ене-Ñ?иÑ?ине:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "ФонÑ? неп_Ñ?омеÑ?иве Ñ?иÑ?ине:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
-msgstr "Ð?Ñ?обине Ñ?ловног лика"
+msgstr "Ð?Ñ?обине Ñ?онÑ?а"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Ð?бликÑ?Ñ? поÑ?Ñ?ке Ñ? H_TML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "Ð?ме и пÑ?езиме:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML поÑ?Ñ?ке"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP поÑ?Ñ?едник:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Ð?аглавÑ?а"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "Ð?аглаÑ?и _Ñ?иÑ?аÑ?е Ñ?а"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "УнÑ?Ñ?аÑ?"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "УнÑ?Ñ?аÑ? (Outlook Ñ?Ñ?ил)"
+#: ../mail/mail-config.glade.h:101
+msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
+msgstr "Уколико Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?и неÑ?Ñ?андаÑ?дан поÑ?Ñ? онда Ñ?е Ñ?егова адÑ?еÑ?а наводи као â??server-name:port-numberâ??"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Ð?знаке"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Табела Ñ?езика"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "Ð?одеÑ?аваÑ?е поÑ?Ñ?е"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Табела заглавÑ?а поÑ?Ñ?е"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
-msgstr "Ð?еÑ?Ñ?о поÑ?Ñ?анÑ?ког Ñ?андÑ?Ñ?еÑ?а"
+msgstr "Ð?окаÑ?иÑ?а поÑ?Ñ?анÑ?ког Ñ?андÑ?Ñ?еÑ?а"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "СаÑ?Ñ?авÑ?аÑ? поÑ?Ñ?ке"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Ð?ез _поÑ?Ñ?едника за:"
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "Ð?апомена: Ð?одвÑ?Ñ?ен знак Ñ? називÑ? коÑ?иÑ?Ñ?и Ñ?е као Ñ?кÑ?аÑ?ениÑ?а Ñ? мениÑ?Ñ?."
+#: ../mail/mail-config.glade.h:112
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "Ð?апомена: подвÑ?Ñ?ен знак Ñ? ознаÑ?и коÑ?иÑ?Ñ?и Ñ?е као Ñ?кÑ?аÑ?ениÑ?а Ñ? мениÑ?Ñ?."
 
-#: ../mail/mail-config.glade.h:109
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: ../mail/mail-config.glade.h:113
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "Ð?апомена: неÑ?еÑ?е биÑ?и Ñ?пиÑ?ани за лозинкÑ? док Ñ?е не повежеÑ?е пÑ?ви пÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Ð?пÑ?иÑ?а Ñ?е занемаÑ?Ñ?Ñ?е Ñ?колико Ñ?е пÑ?онаÑ?ено поклапаÑ?е Ñ?а пÑ?илагоÑ?еним "
-"заглавÑ?ем за нежеÑ?енÑ? поÑ?Ñ?Ñ?."
+msgstr "Ð?пÑ?иÑ?а Ñ?е занемаÑ?Ñ?Ñ?е Ñ?колико Ñ?е пÑ?онаÑ?ено поклапаÑ?е Ñ?а пÑ?илагоÑ?еним заглавÑ?ем за Ñ?Ñ?бÑ?еÑ?ом."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "Ð?Ñ?_ганизаÑ?иÑ?а:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG Ð?Ð? _кÑ?Ñ?Ñ?а:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "_Ð?озинка:"
 
-#: ../mail/mail-config.glade.h:115
-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"
-"Ð?во име Ñ?е биÑ?и коÑ?иÑ?Ñ?ено Ñ?амо за поÑ?Ñ?ебе пÑ?иказа."
+#: ../mail/mail-config.glade.h:119
+#| msgid "Please select among the following options"
+msgid "Please configure the following account settings."
+msgstr "Ð?одеÑ?иÑ?е Ñ?ледеÑ?е поÑ?Ñ?авке налога."
 
-#: ../mail/mail-config.glade.h:117
-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/mail-config.glade.h:120
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
+msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
+msgstr "УнеÑ?иÑ?е доле опиÑ?но име за оваÑ? налог. Ð?во име Ñ?е биÑ?и коÑ?иÑ?Ñ?ено Ñ?амо за поÑ?Ñ?ебе пÑ?иказа."
 
-#: ../mail/mail-config.glade.h:118
-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/mail-config.glade.h:121
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "УнеÑ?иÑ?е подаÑ?ке о наÑ?инÑ? на коÑ?и Ñ?еÑ?е Ñ?лаÑ?и поÑ?Ñ?Ñ?. Ð?ко ниÑ?Ñ?е Ñ?игÑ?Ñ?ни, пиÑ?аÑ?Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?а Ñ?иÑ?Ñ?ема или пÑ?одавÑ?а Ð?нÑ?еÑ?неÑ? Ñ?Ñ?лÑ?га."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Ð?олим изабеÑ?иÑ?е меÑ?Ñ? Ñ?ледеÑ?им могÑ?Ñ?ноÑ?Ñ?има"
+#: ../mail/mail-config.glade.h:122
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "УнеÑ?иÑ?е доле име и елекÑ?Ñ?онÑ?кÑ? адÑ?еÑ?Ñ?. â??Ð?еобавезнаâ?? поÑ?а доле не моÑ?аÑ?Ñ? биÑ?и попÑ?Ñ?ена, оÑ?им ако не желиÑ?е да ове подаÑ?ке Ñ?кÑ?Ñ?Ñ?иÑ?е Ñ? поÑ?Ñ?ке коÑ?е Ñ?аÑ?еÑ?е."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "Ð?оÑ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "УпозоÑ?и када Ñ?аÑ?еÑ? поÑ?Ñ?ке Ñ?амо Ñ?а наведеним Bcc пÑ?имаоÑ?има"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "ЦиÑ?иÑ?ано"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "Ð?_апамÑ?и лозинкÑ?"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "Ð?д_говоÑ?:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Ð?апа_мÑ?и лозинкÑ?"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "Ð?омаÑ?ин за S_OCKS:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ТÑ?_ажи Ñ?оÑ?огÑ?аÑ?иÑ?Ñ? поÑ?иÑ?аоÑ?а Ñ?амо Ñ? локалним адÑ?еÑ?аÑ?има"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "Ð?заб_еÑ?и..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
-msgstr "_Ð?оÑ?аÑ?и пÑ?изнаниÑ?е:"
+msgstr "_Ð?оÑ?аÑ?и повÑ?аÑ?ниÑ?е:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
-msgstr "_СÑ?андаÑ?дни Ñ?ловни лик:"
-
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Ð?дабиÑ?а Ñ?аÑ?Ñ?иклÑ? Ð?Ñ?ипÑ?ема"
+msgstr "_СÑ?андаÑ?дни Ñ?онÑ?:"
 
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
-msgstr "Ð?забеÑ?иÑ?е HTML Ñ?ловни лик Ñ?икÑ?иÑ?ане велиÑ?ине"
+msgstr "Ð?забеÑ?иÑ?е HTML Ñ?онÑ? Ñ?икÑ?иÑ?ане велиÑ?ине"
 
 #: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
-msgstr "Ð?забеÑ?иÑ?е HTML Ñ?ловни лик Ñ?икÑ?иÑ?ане велиÑ?ине за Ñ?Ñ?ампÑ?"
+msgstr "Ð?забеÑ?иÑ?е HTML Ñ?онÑ? Ñ?икÑ?иÑ?ане велиÑ?ине за Ñ?Ñ?ампÑ?"
 
 #: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
-msgstr "Ð?забеÑ?иÑ?е HTML Ñ?ловни лик пÑ?оменÑ?иве велиÑ?ине"
+msgstr "Ð?забеÑ?иÑ?е HTML Ñ?онÑ? пÑ?оменÑ?иве велиÑ?ине"
 
 #: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
-msgstr "Ð?забеÑ?иÑ?е HTML Ñ?ловни лик пÑ?оменÑ?иве велиÑ?ине за Ñ?Ñ?ампÑ?"
-
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Ð?дабиÑ?а Ñ?аÑ?Ñ?иклÑ? Ð?оÑ?лаÑ?о"
+msgstr "Ð?забеÑ?иÑ?е HTML Ñ?онÑ? пÑ?оменÑ?иве велиÑ?ине за Ñ?Ñ?ампÑ?"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "СлаÑ?е поÑ?Ñ?е"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "ФаÑ?Ñ?икла поÑ?лаÑ?иÑ? _поÑ?Ñ?ка:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "СеÑ?_веÑ? Ñ?Ñ?ажи аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../mail/mail-config.glade.h:142
+#| msgid "Server _Type: "
+msgid "Server _Type:"
 msgstr "_Тип Ñ?еÑ?веÑ?а: "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? за _поÑ?пиÑ?иваÑ?е:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Ð?оÑ?п_иÑ?:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Ð?оÑ?пиÑ?и"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Табела поÑ?пиÑ?а"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Ð?Ñ?овеÑ?а пÑ?авопиÑ?а"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "У одговоÑ?Ñ? запоÑ?ни _кÑ?Ñ?аÑ?е на днÑ?"
 
+#: ../mail/mail-config.glade.h:149
+#| msgid "T_ype: "
+msgid "T_ype:"
+msgstr "Т_ип:"
+
 #: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
-msgstr "Т_ип: "
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Ð?иÑ?Ñ?а Ñ?езика овде оÑ?ликава Ñ?амо оне Ñ?езике за коÑ?е имаÑ?е инÑ?Ñ?алиÑ?ан Ñ?еÑ?ник."
 
 #: ../mail/mail-config.glade.h:151
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Ð?иÑ?Ñ?а Ñ?езика овде оÑ?ликава Ñ?амо оне Ñ?езике за коÑ?е имаÑ?е инÑ?Ñ?алиÑ?ан Ñ?еÑ?ник."
-
-#: ../mail/mail-config.glade.h:152
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Ð?злаз ове Ñ?кÑ?ипÑ?е Ñ?е биÑ?и коÑ?иÑ?Ñ?ен као\n"
-"поÑ?пиÑ?. Ð?ме коÑ?е Ñ?Ñ?е дали Ñ?е биÑ?и коÑ?иÑ?Ñ?ено\n"
-"Ñ?амо за Ñ?вÑ?Ñ?Ñ? пÑ?иказиваÑ?а на екÑ?анÑ?. "
+"поÑ?пиÑ?. Ð?ме коÑ?е Ñ?Ñ?е дали Ñ?е биÑ?и коÑ?иÑ?Ñ?ено Ñ?амо за Ñ?вÑ?Ñ?Ñ? пÑ?иказиваÑ?а на екÑ?анÑ?. "
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15015,156 +13653,162 @@ msgstr ""
 "УкÑ?Ñ?аÑ?Ñ?е име по коме желиÑ?е да назовеÑ?е оваÑ? налог.\n"
 "Ð?а пÑ?имеÑ?: â??Ð?оÑ?ловниâ?? или â??Ð?иÑ?ниâ??"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "Ð?оÑ?иÑ?ниÑ?ко_име:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Ð?оÑ?иÑ?Ñ?и аÑ?Ñ?е_нÑ?иÑ?икаÑ?иÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:157
+#: ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "Ð?оÑ?иÑ?ниÑ?ко_име:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "Ð?Ñ?о_менÑ?ива велиÑ?ина:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin. "
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
-"Ð?обÑ?о доÑ?ли Ñ? помоÑ?ника Ð?волÑ?Ñ?иÑ?а подеÑ?аваÑ?а поÑ?Ñ?е.\n"
+"Ð?обÑ?о доÑ?ли Ñ? Ð?омоÑ?ника подеÑ?аваÑ?а поÑ?Ñ?е Ð?волÑ?Ñ?иÑ?е.\n"
 "\n"
 "Ð?ликниÑ?е â??Ð?апÑ?едâ?? за поÑ?еÑ?ак. "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Ð?одаÑ? поÑ?пиÑ?"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Увек Ñ?Ñ?иÑ?аваÑ? Ñ?лике Ñ?а Ð?нÑ?еÑ?неÑ?а"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "_Ð?Ñ?Ñ?омаÑ?Ñ?ко подеÑ?аваÑ?е поÑ?Ñ?едника:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
-msgstr "_Ð?одÑ?азÑ?мевани додаÑ?ак за Ñ?Ñ?бÑ?е:"
+msgstr "_Ð?одÑ?азÑ?мевани пÑ?икÑ?Ñ?Ñ?ак за Ñ?Ñ?бÑ?е:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Ð?иÑ?екÑ?на веза Ñ?а Ð?нÑ?еÑ?неÑ?ом"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ð?е поÑ?пиÑ?Ñ?Ñ? заÑ?Ñ?еве за Ñ?_аÑ?Ñ?анке (Outlook компаÑ?ибилноÑ?Ñ?)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "СÑ?ил _пÑ?оÑ?леÑ?иваÑ?а:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Ð?адÑ?жи поÑ?пиÑ? изнад оÑ?игиналне поÑ?Ñ?ке пÑ?и одговоÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_УÑ?иÑ?аÑ? Ñ?лике од конÑ?акаÑ?а Ñ? поÑ?Ñ?кÑ?"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "_Ð?оÑ?Ñ?ажи Ñ?амо Ñ? локалном адÑ?еÑ?аÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Ð?ека ово бÑ?де моÑ? подÑ?азÑ?мевани налог"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_РÑ?Ñ?но подеÑ?аваÑ?е поÑ?Ñ?едника:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Ð?знаÑ?и поÑ?Ñ?ке као пÑ?оÑ?иÑ?ане поÑ?ле"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Ð?икада не Ñ?Ñ?иÑ?аваÑ? Ñ?лике Ñ?а Ð?нÑ?еÑ?неÑ?а"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Ð?Ñ?Ñ?аÑ?а:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_УпозоÑ?и пÑ?и Ñ?лаÑ?Ñ? HTML поÑ?Ñ?е конÑ?акÑ?има коÑ?и иÑ? не желе"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_УпозоÑ?и када Ñ?аÑ?еÑ? поÑ?Ñ?ке без наÑ?лова"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_СÑ?ил одговоÑ?а:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_СкÑ?ипÑ?а:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Ð?езбедан HTTP поÑ?Ñ?едник:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "Ð?заб_еÑ?и..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Ð?Ñ?икажи _анимаÑ?иÑ?е"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Ð?Ñ?икажи Ñ?оÑ?огÑ?аÑ?иÑ?Ñ? поÑ?иÑ?аоÑ?а Ñ? пÑ?егледÑ? поÑ?Ñ?е"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_СажмиÑ?е Ð?РÐ?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?/Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð? заглавÑ?а Ñ? "
+msgstr "_Сажми заглавÑ?а To / Cc / Bcc Ñ? "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?игÑ?Ñ?нÑ? везÑ?:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?иÑ?Ñ?емÑ?ке поÑ?Ñ?авке"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
-msgstr "_Ð?оÑ?иÑ?Ñ?и иÑ?Ñ?е Ñ?ловне ликове као дÑ?Ñ?ги пÑ?огÑ?ами"
+msgstr "_Ð?оÑ?иÑ?Ñ?и иÑ?Ñ?е Ñ?онÑ?ове као дÑ?Ñ?ги пÑ?огÑ?ами"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "Ð?дÑ?еÑ?е"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "боÑ?а"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "опиÑ?"
 
+# bug: plural-forms
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "Ñ?екÑ?нде"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -15191,54 +13835,39 @@ msgstr "Све локале и акÑ?ивне мÑ?ежне Ñ?аÑ?Ñ?икле"
 
 #: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
-msgstr "Све локалнеÑ?аÑ?Ñ?икле"
-
-#: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "_Ð?Ñ?еÑ?Ñ?иво на велиÑ?инÑ? Ñ?лова"
+msgstr "Све локалне Ñ?аÑ?Ñ?икле"
 
 # timezone.
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
 msgid "Co_mpleted"
 msgstr "Ð?а_вÑ?Ñ?ено"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "Ð?Ñ?о_наÑ?и:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "Ð?Ñ?онаÑ?и Ñ? поÑ?Ñ?Ñ?и"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Ð?знаÑ?и за пÑ?аÑ?еÑ?е"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Ð?Ñ?иÑ?аве на Ñ?аÑ?Ñ?икле"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "УговоÑ? о лиÑ?енÑ?и"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "Ð?иÑ?Ñ?а ниÑ?е изабÑ?ано"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "С_еÑ?веÑ?:"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "СигÑ?Ñ?ноÑ?ни подаÑ?и"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
-msgstr "Ð?ведене Ñ?аÑ?Ñ?икле"
+msgstr "Ð?дÑ?еÑ?ене Ñ?аÑ?Ñ?икле"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15246,19 +13875,19 @@ msgstr ""
 "Ð?оÑ?Ñ?ке коÑ?е Ñ?Ñ?е изабÑ?али за пÑ?аÑ?еÑ?е Ñ?Ñ? доле излиÑ?Ñ?ане.\n"
 "Ð?забеÑ?иÑ?е Ñ?адÑ?Ñ? за извÑ?Ñ?аваÑ?е из мениÑ?а â??Ð?знакаâ??."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Ð?Ñ?иÑ?ваÑ?и лиÑ?енÑ?Ñ?"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Рок:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Ð?знака:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "Ð?з_наÑ?иÑ?е ово да пÑ?иÑ?ваÑ?иÑ?е Ñ?говоÑ? о лиÑ?енÑ?и"
 
@@ -15267,133 +13896,138 @@ msgstr "Ð?з_наÑ?иÑ?е ово да пÑ?иÑ?ваÑ?иÑ?е Ñ?говоÑ? о ли
 msgid "Pinging %s"
 msgstr "Ð?Ñ?пиÑ?Ñ?Ñ?ем доÑ?Ñ?Ñ?пноÑ?Ñ? за %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "ФилÑ?Ñ?иÑ?аÑ?е изабÑ?аниÑ? поÑ?Ñ?ка"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "УзимаÑ?е поÑ?Ñ?е"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ð?еÑ?Ñ?пела пÑ?имена одлазеÑ?иÑ? Ñ?илÑ?еÑ?а: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 "Ð?еÑ?Ñ?пело допÑ?Ñ?аваÑ?е Ñ? %s: %s\n"
-"Ð?опÑ?Ñ?аваÑ?е Ñ? локалнÑ? Ñ?аÑ?Ñ?иклÑ? â??Ð?оÑ?лаÑ?оâ??."
+"Ð?опÑ?Ñ?аваÑ?е Ñ? локалнÑ? Ñ?аÑ?Ñ?иклÑ? â??Ð?оÑ?лаÑ?оâ??."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Ð?еÑ?Ñ?пело допÑ?Ñ?аваÑ?е Ñ? локалнÑ? Ñ?аÑ?Ñ?иклÑ? â??Ð?оÑ?лаÑ?оâ??: %s"
+msgstr "Ð?еÑ?Ñ?пело допÑ?Ñ?аваÑ?е Ñ? локалнÑ? Ñ?аÑ?Ñ?иклÑ? â??Ð?оÑ?лаÑ?оâ??: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "СлаÑ?е поÑ?Ñ?ке"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "СлаÑ?е поÑ?Ñ?ке %d од %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Ð?еÑ?Ñ?пело Ñ?лаÑ?е %d од %d поÑ?Ñ?ка"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Ð?Ñ?казано."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Ð?авÑ?Ñ?ено."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "ЧÑ?ваÑ?е поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Ð?Ñ?емеÑ?Ñ?аÑ?е поÑ?Ñ?ка Ñ? %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "УмножаваÑ?е поÑ?Ñ?ка Ñ? %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "Ð?Ñ?оÑ?леÑ?ене поÑ?Ñ?ке"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ð?Ñ?ваÑ?аÑ?е Ñ?аÑ?Ñ?икле %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Ð?обиÑ?ам подаÑ?ке о квоÑ?и за Ñ?аÑ?Ñ?иклÑ? %s"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Ð?Ñ?ваÑ?аÑ?е оÑ?Ñ?аве %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "УклаÑ?аÑ?е Ñ?аÑ?Ñ?икле %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "СмеÑ?Ñ?аÑ?е Ñ?аÑ?Ñ?икле â??%sâ??"
+msgstr "СмеÑ?Ñ?аÑ?е Ñ?аÑ?Ñ?икле â??%sâ??"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "Ð?Ñ?ажÑ?еÑ?е и Ñ?меÑ?Ñ?аÑ?е налога â??%sâ??"
+msgstr "Ð?Ñ?ажÑ?еÑ?е и Ñ?меÑ?Ñ?аÑ?е налога â??%sâ??"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
-msgstr "СмеÑ?Ñ?аÑ?е налога â??%sâ??"
+msgstr "СмеÑ?Ñ?аÑ?е налога â??%sâ??"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Ð?Ñ?вежаваÑ?е Ñ?аÑ?Ñ?икле"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693
+#: ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Ð?Ñ?ажÑ?еÑ?е Ñ?аÑ?Ñ?икле"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Ð?збаÑ?иваÑ?е Ñ?меÑ?а Ñ? â??%sâ??"
+msgstr "Ð?збаÑ?иваÑ?е Ñ?меÑ?а Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Ð?окалне Ñ?аÑ?Ñ?икле"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ð?овлаÑ?еÑ?е поÑ?Ñ?ке %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15401,7 +14035,7 @@ msgstr[0] "Ð?овлаÑ?еÑ?е %d поÑ?Ñ?ке"
 msgstr[1] "Ð?овлаÑ?еÑ?е %d поÑ?Ñ?ке"
 msgstr[2] "Ð?овлаÑ?еÑ?е %d поÑ?Ñ?ка"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15409,7 +14043,7 @@ msgstr[0] "ЧÑ?ваÑ?е %d поÑ?Ñ?ке"
 msgstr[1] "ЧÑ?ваÑ?е %d поÑ?Ñ?ке"
 msgstr[2] "ЧÑ?ваÑ?е %d поÑ?Ñ?ка"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15418,11 +14052,12 @@ msgstr ""
 "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?ваÑ?Ñ? поÑ?Ñ?ке Ñ?: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "ЧÑ?ваÑ?е пÑ?илога"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15431,33 +14066,33 @@ msgstr ""
 "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е излазне даÑ?оÑ?еке: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ð?иÑ?е могÑ?Ñ? Ñ?пиÑ? подаÑ?ака: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ð?Ñ?екидаÑ?е везе Ñ?а %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ð?оновно повезиваÑ?е на %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Ð?Ñ?ипÑ?ема налог â??%sâ?? за Ñ?ад ван мÑ?еже"
+msgstr "Ð?Ñ?ипÑ?ема налог â??%sâ?? за Ñ?ад ван мÑ?еже"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
-msgstr "Ð?Ñ?овеÑ?а Ñ?Ñ?лÑ?ге"
+msgstr "Ð?Ñ?овеÑ?а Ñ?еÑ?виÑ?а"
 
 #: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
-msgstr "Ð?дÑ?Ñ?Ñ?аÑ?аÑ?е Ñ?е Ñ? Ñ?окÑ?..."
+msgstr "Ð?Ñ?казиваÑ?е..."
 
 #: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
@@ -15465,65 +14100,66 @@ msgstr "СлаÑ?е и пÑ?имаÑ?е поÑ?Ñ?е"
 
 #: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
-msgstr "Ð?бÑ?Ñ?Ñ?ави _Ñ?ве"
+msgstr "Ð?Ñ?кажи _Ñ?ве"
 
 #: ../mail/mail-send-recv.c:503
 msgid "Updating..."
-msgstr "Ð?Ñ?вежаваÑ?е..."
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "ЧекаÑ?е..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ð?Ñ?овеÑ?а за нове поÑ?Ñ?ке"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "УнеÑ?иÑ?е лозинкÑ? за %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "УнеÑ?иÑ?е лозинкÑ?"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "УнеÑ?иÑ?е лозинкÑ? за %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "УнеÑ?иÑ?е лозинкÑ?"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
-msgstr "Ð?оÑ?иÑ?ник Ñ?е обÑ?Ñ?Ñ?авио опеÑ?аÑ?иÑ?Ñ?."
+msgstr "Ð?оÑ?иÑ?ник Ñ?е оÑ?казао опеÑ?аÑ?иÑ?Ñ?."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "_СаÑ?Ñ?ваÑ? и заÑ?воÑ?и"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
-msgstr "УÑ?еÑ?Ñ?Ñ?е поÑ?пиÑ?"
+msgstr "УÑ?еди поÑ?пиÑ?"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "Ð?азив _поÑ?пиÑ?а:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?ма за пÑ?ипÑ?емÑ? â??%sâ??: %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?ма за пÑ?ипÑ?емÑ? â??%sâ??: %s"
 
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Ð?окÑ?Ñ?ава пÑ?емеÑ?Ñ?аÑ?е поÑ?Ñ?е из не-mbox извоÑ?а â??%sâ??"
+msgstr "Ð?окÑ?Ñ?ава пÑ?емеÑ?Ñ?аÑ?е поÑ?Ñ?е из не-mbox извоÑ?а â??%sâ??"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -15537,28 +14173,28 @@ msgstr "Ð?Ñ?оÑ?леÑ?ена поÑ?Ñ?ка"
 #: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
-msgstr "Ð?еиÑ?пÑ?авна Ñ?аÑ?Ñ?икла â??%sâ??"
+msgstr "Ð?еиÑ?пÑ?авна Ñ?аÑ?Ñ?икла â??%sâ??"
 
 #: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Ð?одеÑ?аваÑ?е Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Ð?Ñ?вежаваÑ?е Ñ?аÑ?Ñ?икла пÑ?еÑ?Ñ?аге за â??%s: %sâ??"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е Ñ?аÑ?Ñ?икла пÑ?еÑ?Ñ?аге за â??%s: %sâ??"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Ð?Ñ?вежаваÑ?е Ñ?аÑ?Ñ?икла пÑ?еÑ?Ñ?аге за â??%sâ??"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ?е Ñ?аÑ?Ñ?икла пÑ?еÑ?Ñ?аге за â??%sâ??"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "УÑ?еди Ñ?аÑ?Ñ?иклÑ? пÑ?еÑ?Ñ?аге"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Ð?ова Ñ?аÑ?Ñ?икла пÑ?еÑ?Ñ?аге"
 
@@ -15575,34 +14211,24 @@ msgstr "ФаÑ?Ñ?икла имена â??{1}â?? веÑ? поÑ?Ñ?оÑ?и. Ð?одел
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "ФаÑ?Ñ?икла Ñ?а Ñ?адÑ?жаÑ?ем на â??{1}â?? веÑ? поÑ?Ñ?оÑ?и.\n"
 "\n"
-"Ð?ожеÑ?е или да игноÑ?иÑ?еÑ?е овÑ? Ñ?аÑ?Ñ?иклÑ?, пÑ?епиÑ?еÑ?е Ñ?е или допÑ?ниÑ?е Ñ?ен "
-"Ñ?адÑ?жаÑ?, или изаÑ?еÑ?е."
+"Ð?ожеÑ?е или да игноÑ?иÑ?еÑ?е овÑ? Ñ?аÑ?Ñ?иклÑ?, пÑ?епиÑ?еÑ?е Ñ?е или допÑ?ниÑ?е Ñ?ен Ñ?адÑ?жаÑ?, или изаÑ?еÑ?е."
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr "Ð?Ñ?изнаниÑ?а Ñ?е заÑ?Ñ?ажена за â??{1}â??. Ð?оÑ?лаÑ?и пÑ?изнаниÑ?Ñ? за {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "Ð?овÑ?аÑ?ниÑ?а Ñ?е заÑ?Ñ?ажена за â??{1}â??. Ð?оÑ?лаÑ?и повÑ?аÑ?ниÑ?Ñ? за {0}?"
 
 # mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "Ð?оÑ?пиÑ? назван â??{0}â?? веÑ? поÑ?Ñ?оÑ?и. Ð?аведиÑ?е дÑ?Ñ?го име."
 
 #: ../mail/mail.error.xml.h:8
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Ð?одаваÑ?ем Ñ?миÑ?леног наÑ?лова ваÑ?им поÑ?Ñ?кама даÑ?еÑ?е пÑ?имаоÑ?има до знаÑ?а о Ñ?емÑ? "
-"пиÑ?еÑ?е."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Ð?одаваÑ?ем Ñ?миÑ?леног наÑ?лова поÑ?Ñ?кама даÑ?еÑ?е пÑ?имаоÑ?има до знаÑ?а о Ñ?емÑ? пиÑ?еÑ?е."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15613,8 +14239,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е оваÑ? налог?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "СигÑ?Ñ?но желиÑ?е да иÑ?кÑ?Ñ?Ñ?иÑ?е оваÑ? налог и обÑ?иÑ?еÑ?е Ñ?ве поÑ?Ñ?еднике?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15622,16 +14247,11 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "СигÑ?Ñ?но желиÑ?е да оÑ?воÑ?иÑ?е {0} поÑ?Ñ?ка одÑ?едном?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"СигÑ?Ñ?но желиÑ?е Ñ?Ñ?аÑ?но да Ñ?клониÑ?е Ñ?ве обÑ?иÑ?ане поÑ?Ñ?ке из Ñ?виÑ? Ñ?аÑ?Ñ?икли?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "СигÑ?Ñ?но желиÑ?е Ñ?Ñ?аÑ?но да Ñ?клониÑ?е Ñ?ве обÑ?иÑ?ане поÑ?Ñ?ке из Ñ?виÑ? Ñ?аÑ?Ñ?икли?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
 msgstr "Ð?елиÑ?е ли Ñ?Ñ?аÑ?но да Ñ?клониÑ?е Ñ?ве обÑ?иÑ?ане поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле â??{0}â???"
 
 #: ../mail/mail.error.xml.h:15
@@ -15712,12 +14332,8 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и Ñ?иÑ? â??{2}â??."
 
 #: ../mail/mail.error.xml.h:34
-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}â??, због пÑ?облема Ñ?а инÑ?Ñ?алаÑ?иÑ?ом. "
-"Ð?еÑ?еÑ?е моÑ?и да коÑ?иÑ?Ñ?иÑ?е овог пÑ?Ñ?жаоÑ?а док не пÑ?иÑ?ваÑ?иÑ?е лиÑ?енÑ?Ñ?."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?оÑ?иÑ?аÑ?и даÑ?оÑ?екÑ? лиÑ?енÑ?е â??{0}â??, због пÑ?облема Ñ?а инÑ?Ñ?алаÑ?иÑ?ом. Ð?еÑ?еÑ?е моÑ?и да коÑ?иÑ?Ñ?иÑ?е овог пÑ?Ñ?жаоÑ?а док не пÑ?иÑ?ваÑ?иÑ?е лиÑ?енÑ?Ñ?."
 
 # mail:no-rename-folder primary
 #: ../mail/mail.error.xml.h:35
@@ -15752,12 +14368,8 @@ msgid "Check Junk Failed"
 msgstr "Ð?Ñ?овеÑ?а нежеÑ?ене поÑ?Ñ?е ниÑ?е Ñ?Ñ?пела"
 
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Ð?Ñ?овеÑ?иÑ?е да ли Ñ?Ñ?е иÑ?пÑ?авно оÑ?кÑ?Ñ?али лозинкÑ?. Ð?е забоÑ?авиÑ?е да Ñ?е Ñ? веÑ?ини "
-"лозинки велиÑ?ина Ñ?лова биÑ?на; можда Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ена велика Ñ?лова."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?Ñ?е иÑ?пÑ?авно оÑ?кÑ?Ñ?али лозинкÑ?. Ð?е забоÑ?авиÑ?е да Ñ?е Ñ? веÑ?ини лозинки велиÑ?ина Ñ?лова биÑ?на; можда Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ена велика Ñ?лова."
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15796,12 +14408,8 @@ msgid "Do not disable"
 msgstr "Ð?емоÑ? иÑ?кÑ?Ñ?Ñ?иÑ?и"
 
 #: ../mail/mail.error.xml.h:52
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
-"Ð?елиÑ?е ли локално да Ñ?Ñ?кладиÑ?е Ñ?аÑ?Ñ?икле коÑ?е Ñ?Ñ? ознаÑ?ене за коÑ?иÑ?Ñ?еÑ?е ван "
-"мÑ?еже?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgstr "Ð?елиÑ?е ли локално да Ñ?Ñ?кладиÑ?е Ñ?аÑ?Ñ?икле коÑ?е Ñ?Ñ? ознаÑ?ене за коÑ?иÑ?Ñ?еÑ?е ван мÑ?еже?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15841,12 +14449,8 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "Уколико наÑ?Ñ?авиÑ?е, неÑ?еÑ?е моÑ?и да вÑ?аÑ?иÑ?е ове поÑ?Ñ?ке."
 
 #: ../mail/mail.error.xml.h:62
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"Уколико обÑ?иÑ?еÑ?е Ñ?аÑ?Ñ?иклÑ?, Ñ?ав Ñ?ен Ñ?адÑ?жаÑ? и Ñ?адÑ?жаÑ? подÑ?аÑ?Ñ?икли Ñ?е биÑ?и "
-"Ñ?Ñ?аÑ?но обÑ?иÑ?ани."
+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 proceed, all proxy accounts will be deleted permanently."
@@ -15865,12 +14469,8 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наÑ?Ñ?авиÑ?е, подаÑ?и налога биÑ?е Ñ?Ñ?аÑ?но обÑ?иÑ?ани."
 
 #: ../mail/mail.error.xml.h:67
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Уколико изаÑ?еÑ?е, ове поÑ?Ñ?ке неÑ?е биÑ?и поÑ?лаÑ?е док поново не покÑ?енеÑ?е "
-"Ð?волÑ?Ñ?иÑ?Ñ?."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "Уколико изаÑ?еÑ?е, ове поÑ?Ñ?ке неÑ?е биÑ?и поÑ?лаÑ?е док поново не покÑ?енеÑ?е Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15882,18 +14482,11 @@ msgstr "Ð?еиÑ?пÑ?авна аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
-msgstr "ФилÑ?еÑ?и поÑ?Ñ?е Ñ?Ñ? аÑ?Ñ?омаÑ?Ñ?ки оÑ?вежени."
+msgstr "ФилÑ?еÑ?и поÑ?Ñ?е Ñ?Ñ? аÑ?Ñ?омаÑ?Ñ?ки ажÑ?Ñ?иÑ?ани."
 
 #: ../mail/mail.error.xml.h:72
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Ð?ноги Ñ?иÑ?Ñ?еми е-поÑ?Ñ?е додаÑ?Ñ? заглавÑ?е Ð?згледа-пÑ?има поÑ?Ñ?кама коÑ?е имаÑ?Ñ? Ñ?амо "
-"BCC пÑ?имаоÑ?е. Ð?во Ñ?е заглавÑ?е, ако Ñ?е додаÑ?о, излиÑ?Ñ?аÑ?и Ñ?ве пÑ?имаоÑ?е поÑ?Ñ?ке. "
-"Ð?а би избегли ово, додаÑ?Ñ?е баÑ?ем Ñ?едног Ð?Ñ?има: или CC: пÑ?имаоÑ?а."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Ð?ноги Ñ?иÑ?Ñ?еми е-поÑ?Ñ?е додаÑ?Ñ? заглавÑ?е Ð?згледа-пÑ?има поÑ?Ñ?кама коÑ?е имаÑ?Ñ? Ñ?амо BCC пÑ?имаоÑ?е. Ð?во Ñ?е заглавÑ?е, ако Ñ?е додаÑ?о, излиÑ?Ñ?аÑ?и Ñ?ве пÑ?имаоÑ?е поÑ?Ñ?ке. Ð?а би избегли ово, додаÑ?Ñ?е баÑ?ем Ñ?едног Ð?Ñ?има: или CC: пÑ?имаоÑ?а."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15917,20 +14510,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 ""
-"УнеÑ?иÑ?е важеÑ?Ñ? елекÑ?Ñ?онÑ?кÑ? адÑ?еÑ?Ñ? Ñ? поÑ?е Ð?Ñ?има:. Ð?ожеÑ?е пÑ?еÑ?Ñ?ажиÑ?и "
-"елекÑ?Ñ?онÑ?ке адÑ?еÑ?е кликом на дÑ?гме Ð?Ñ?има: поÑ?ед поÑ?а за Ñ?ноÑ?."
+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 ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
 "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?ледеÑ?и пÑ?имаоÑ?и желе и могÑ? да пÑ?име HTML поÑ?Ñ?Ñ?:\n"
@@ -15938,7 +14526,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
-msgstr "Ð?олим даÑ?Ñ?е Ñ?едно Ñ?единÑ?Ñ?вено име коÑ?е пÑ?едÑ?Ñ?авÑ?а оваÑ? поÑ?пиÑ?."
+msgstr "Ð?аÑ?Ñ?е Ñ?едно Ñ?единÑ?Ñ?вено име коÑ?е пÑ?едÑ?Ñ?авÑ?а оваÑ? поÑ?пиÑ?."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Please wait."
@@ -15958,7 +14546,7 @@ msgstr "СлаÑ?е Ñ?пиÑ?а Ñ?еÑ?веÑ?Ñ? за лиÑ?Ñ?Ñ? подÑ?жаниÑ?
 
 #: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
-msgstr "Ð?аÑ?Ñ?ажене пÑ?изнаниÑ?е."
+msgstr "Ð?аÑ?Ñ?ажене повÑ?аÑ?ниÑ?е."
 
 #: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
@@ -15966,20 +14554,20 @@ msgstr "Ð?аиÑ?Ñ?а обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??{0}â?? и Ñ?ве по
 
 #: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
-msgstr "Ð?звеÑ?Ñ?аваÑ?е за нежеÑ?енÑ? поÑ?Ñ?Ñ? ниÑ?е Ñ?Ñ?пело"
+msgstr "Ð?звеÑ?Ñ?аваÑ?е за Ñ?Ñ?бÑ?е ниÑ?е Ñ?Ñ?пело"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr "Ð?звеÑ?Ñ?аваÑ?е да ниÑ?е нежеÑ?ена поÑ?Ñ?а неÑ?Ñ?пело"
+msgstr "Ð?звеÑ?Ñ?аваÑ?е да ниÑ?е Ñ?Ñ?бÑ?е неÑ?Ñ?пело"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
-msgstr "ФаÑ?Ñ?икле пÑ?еÑ?Ñ?аге Ñ?Ñ? аÑ?Ñ?омаÑ?Ñ?ки оÑ?вежене."
+msgstr "ФаÑ?Ñ?икле пÑ?еÑ?Ñ?аге Ñ?Ñ? аÑ?Ñ?омаÑ?Ñ?ки ажÑ?Ñ?иÑ?ане."
 
 # bug(slobo): веÑ?оваÑ?но извеÑ?Ñ?аÑ? о доÑ?Ñ?ави
 #: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
-msgstr "Ð?оÑ?аÑ?и пÑ?изнаниÑ?Ñ?"
+msgstr "Ð?оÑ?аÑ?и повÑ?аÑ?ниÑ?Ñ?"
 
 #: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
@@ -15991,32 +14579,23 @@ msgstr "УÑ?клади"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
-msgstr "УÑ?кладиÑ?и Ñ?аÑ?Ñ?икле локално за Ñ?ад ван мÑ?еже."
+msgstr "УÑ?кладиÑ?и Ñ?аÑ?Ñ?икле локално за Ñ?ад ван мÑ?еже?"
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"СиÑ?Ñ?емÑ?ке Ñ?аÑ?Ñ?икле неопÑ?одне да би Ð?волÑ?Ñ?иÑ?а иÑ?пÑ?авно Ñ?адила Ñ?е не могÑ? "
-"пÑ?еименоваÑ?и, пÑ?емеÑ?Ñ?иÑ?и или обÑ?иÑ?аÑ?и."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "СиÑ?Ñ?емÑ?ке Ñ?аÑ?Ñ?икле неопÑ?одне да би Ð?волÑ?Ñ?иÑ?а иÑ?пÑ?авно Ñ?адила Ñ?е не могÑ? пÑ?еименоваÑ?и, пÑ?емеÑ?Ñ?иÑ?и или обÑ?иÑ?аÑ?и."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
-"Ð?иÑ?Ñ?а конÑ?акаÑ?а коÑ?оÑ? Ñ?аÑ?еÑ?е Ñ?е подеÑ?ена да Ñ?кÑ?ива пÑ?имаоÑ?е лиÑ?Ñ?е.\n"
+"Ð?онÑ?акаÑ? лиÑ?Ñ?а коÑ?оÑ? Ñ?аÑ?еÑ?е Ñ?е подеÑ?ена да Ñ?кÑ?ива пÑ?имаоÑ?е лиÑ?Ñ?е.\n"
 "\n"
-"Ð?ноги Ñ?иÑ?Ñ?еми е-поÑ?Ñ?е додаÑ?Ñ? заглавÑ?е Ð?згледа-пÑ?има поÑ?Ñ?кама коÑ?е имаÑ?Ñ? Ñ?амо "
-"BCC пÑ?имаоÑ?е. Ð?во Ñ?е заглавÑ?е, ако Ñ?е додаÑ?о, излиÑ?Ñ?аÑ?и Ñ?ве пÑ?имаоÑ?е поÑ?Ñ?ке. "
-"Ð?а би избегли ово, додаÑ?Ñ?е баÑ?ем Ñ?едног Ð?Ñ?има: или CC: пÑ?имаоÑ?а."
+"Ð?ноги Ñ?иÑ?Ñ?еми е-поÑ?Ñ?е додаÑ?Ñ? заглавÑ?е Ð?згледа-пÑ?има поÑ?Ñ?кама коÑ?е имаÑ?Ñ? Ñ?амо BCC пÑ?имаоÑ?е. Ð?во Ñ?е заглавÑ?е, ако Ñ?е додаÑ?о, излиÑ?Ñ?аÑ?и Ñ?ве пÑ?имаоÑ?е поÑ?Ñ?ке. Ð?а би избегли ово, додаÑ?Ñ?е баÑ?ем Ñ?едног Ð?Ñ?има: или CC: пÑ?имаоÑ?а."
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -16030,7 +14609,7 @@ msgstr ""
 "{0}\n"
 "Ð?оÑ?иÑ?Ñ?и Ñ?ада Ñ?клоÑ?енÑ? Ñ?аÑ?Ñ?иклÑ?:\n"
 "    â??{1}â??\n"
-"Ð? Ñ?ада Ñ?е(Ñ?Ñ?) оÑ?вежена(е)."
+"Ð? Ñ?ада Ñ?е(Ñ?Ñ?) ажÑ?Ñ?иÑ?ана(е)."
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
@@ -16044,7 +14623,7 @@ msgstr ""
 "{0}\n"
 "Ð?оÑ?иÑ?Ñ?и Ñ?ада Ñ?клоÑ?енÑ? Ñ?аÑ?Ñ?иклÑ?:\n"
 "    â??{1}â??\n"
-"Ð? Ñ?ада Ñ?е(Ñ?Ñ?) оÑ?вежено(а)."
+"Ð? Ñ?ада Ñ?е(Ñ?Ñ?) ажÑ?Ñ?иÑ?ано(а)."
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -16059,46 +14638,32 @@ msgstr ""
 "идиÑ?е Ñ? Ñ?Ñ?еÑ?иваÑ? Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге и додаÑ?Ñ?е Ñ?е изÑ?иÑ?иÑ?о, ако желиÑ?е."
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Ð?ва поÑ?Ñ?ка Ñ?е не може поÑ?лаÑ?и поÑ?Ñ?о Ñ?е иÑ?кÑ?Ñ?Ñ?ен налог Ñ?а коÑ?ег Ñ?аÑ?еÑ?е"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Ð?ва поÑ?Ñ?ка Ñ?е не може поÑ?лаÑ?и поÑ?Ñ?о ниÑ?Ñ?е навели ниÑ?едног пÑ?имаоÑ?а"
 
 #: ../mail/mail.error.xml.h:116
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Ð?ваÑ? Ñ?еÑ?веÑ? не подÑ?жава Ñ?Ñ?ажени Ñ?ип аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е и можда Ñ?опÑ?Ñ?е не "
-"подÑ?жава аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ?."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Ð?ваÑ? Ñ?еÑ?веÑ? не подÑ?жава Ñ?Ñ?ажени Ñ?ип аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е и можда Ñ?опÑ?Ñ?е не подÑ?жава аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ?."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ð?ваÑ? поÑ?пиÑ? Ñ?е пÑ?омеÑ?ен, али ниÑ?е Ñ?аÑ?Ñ?ван."
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Ð?во ознаÑ?ава Ñ?ве поÑ?Ñ?ке као пÑ?оÑ?иÑ?ане Ñ? изабÑ?аноÑ? Ñ?аÑ?Ñ?икли и подÑ?аÑ?Ñ?иклама."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgstr "Ð?во ознаÑ?ава Ñ?ве поÑ?Ñ?ке као пÑ?оÑ?иÑ?ане Ñ? изабÑ?аноÑ? Ñ?аÑ?Ñ?икли и подÑ?аÑ?Ñ?иклама."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Ð?еÑ?Ñ?пело повезиваÑ?е на GroupWise Ñ?еÑ?веÑ?."
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?аÑ?Ñ?икле за пÑ?ипÑ?емÑ? за оваÑ? налог.  Ð?оÑ?иÑ?Ñ?иÑ?и "
-"Ñ?иÑ?Ñ?емÑ?кÑ? Ñ?аÑ?Ñ?иклÑ? за пÑ?ипÑ?емÑ??"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?аÑ?Ñ?икле наÑ?Ñ?Ñ?а за оваÑ? налог. Ð?оÑ?иÑ?Ñ?иÑ?и Ñ?иÑ?Ñ?емÑ?кÑ? Ñ?аÑ?Ñ?иклÑ? наÑ?Ñ?Ñ?а?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -16110,16 +14675,14 @@ msgstr "Ð?оÑ?иÑ?Ñ?и _подÑ?азÑ?мевано"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
-msgstr "Ð?оÑ?иÑ?Ñ?иÑ?и подÑ?азÑ?меванÑ? Ñ?аÑ?Ñ?иклÑ? за пÑ?ипÑ?емÑ??"
+msgstr "Ð?оÑ?иÑ?Ñ?иÑ?и подÑ?азÑ?меванÑ? Ñ?аÑ?Ñ?иклÑ? наÑ?Ñ?Ñ?а?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"УпозоÑ?еÑ?е: бÑ?иÑ?аÑ?е поÑ?Ñ?ка из Ñ?аÑ?Ñ?икле пеÑ?Ñ?Ñ?аге Ñ?е обÑ?иÑ?аÑ?и Ñ?амÑ? поÑ?Ñ?кÑ? Ñ?а "
-"Ñ?ене локаÑ?иÑ?е Ñ? Ñ?аÑ?Ñ?икли.\n"
+"УпозоÑ?еÑ?е: бÑ?иÑ?аÑ?е поÑ?Ñ?ка из Ñ?аÑ?Ñ?икле пÑ?еÑ?Ñ?аге Ñ?е обÑ?иÑ?аÑ?и Ñ?амÑ? поÑ?Ñ?кÑ? Ñ?а Ñ?ене локаÑ?иÑ?е Ñ? Ñ?аÑ?Ñ?икли.\n"
 "Ð?елиÑ?е ли ово да Ñ?Ñ?адиÑ?е?"
 
 #: ../mail/mail.error.xml.h:127
@@ -16145,12 +14708,10 @@ msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и Ñ?аÑ?Ñ?иклÑ?."
 #: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "Ð?оÑ?аÑ?е навеÑ?Ñ?и баÑ? Ñ?еднÑ? Ñ?аÑ?Ñ?иклÑ? као извоÑ?.\n"
-"Ð?ило поÑ?единаÑ?ним избоÑ?ом Ñ?аÑ?Ñ?икли, и/или избоÑ?ом Ñ?виÑ? локалниÑ? Ñ?аÑ?Ñ?икли, "
-"Ñ?виÑ? мÑ?ежниÑ? Ñ?аÑ?Ñ?икли или и Ñ?едниÑ? и дÑ?Ñ?гиÑ?."
+"Ð?ило поÑ?единаÑ?ним избоÑ?ом Ñ?аÑ?Ñ?икли, и/или избоÑ?ом Ñ?виÑ? локалниÑ? Ñ?аÑ?Ñ?икли, Ñ?виÑ? мÑ?ежниÑ? Ñ?аÑ?Ñ?икли или и Ñ?едниÑ? и дÑ?Ñ?гиÑ?."
 
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -16176,87 +14737,89 @@ msgstr "Ð?з_баÑ?и"
 msgid "_Open Messages"
 msgstr "_Ð?Ñ?воÑ?и поÑ?Ñ?ке"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ð?евиÑ?ено"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Ð?иÑ?ено"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Ð?дговоÑ?ено"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Ð?Ñ?оÑ?леÑ?ено"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Ð?иÑ?еÑ?Ñ?Ñ?Ñ?ке невиÑ?ене поÑ?Ñ?ке"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Ð?иÑ?еÑ?Ñ?Ñ?Ñ?ке поÑ?Ñ?ке"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Ð?аÑ?ниже"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Ð?иже"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Ð?иÑ?е"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Ð?аÑ?виÑ?е"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1661
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Ð?анаÑ? %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Ð?Ñ?Ñ?е %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4456
+#: ../mail/message-list.c:3987
+#: ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Ð?Ñ?авÑ?еÑ?е лиÑ?Ñ?е поÑ?Ñ?ка"
 
-#: ../mail/message-list.c:4295
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"Ð?ема поÑ?Ñ?ке Ñ?а задаÑ?им Ñ?Ñ?ловим пÑ?еÑ?Ñ?аге. Ð?ожеÑ?е оÑ?иÑ?Ñ?иÑ?и пÑ?еÑ?Ñ?агÑ? из мениÑ?а "
-"Ð?Ñ?еÑ?Ñ?ага->Ð?Ñ?иÑ?Ñ?и или Ñ?е измениÑ?и."
+#: ../mail/message-list.c:4299
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "Ð?ема поÑ?Ñ?ке Ñ?а задаÑ?им Ñ?Ñ?ловим пÑ?еÑ?Ñ?аге. Ð?ожеÑ?е оÑ?иÑ?Ñ?иÑ?и пÑ?еÑ?Ñ?агÑ? из мениÑ?а Ð?Ñ?еÑ?Ñ?ага->Ð?Ñ?иÑ?Ñ?и или Ñ?е измениÑ?и."
 
-#: ../mail/message-list.c:4297
+#: ../mail/message-list.c:4301
+msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+msgstr "У овоÑ? Ñ?Ñ? Ñ?аÑ?Ñ?икли Ñ?амо Ñ?кÑ?ивене Ñ?лике. Ð?а би иÑ? видели, Ñ?поÑ?Ñ?ебиÑ?е Ð?Ñ?еглед->Ð?Ñ?икажи Ñ?кÑ?ивене Ñ?лике."
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "Ð?ема поÑ?Ñ?ка Ñ? овоÑ? Ñ?аÑ?Ñ?икли."
 
@@ -16282,51 +14845,54 @@ msgstr "Ð?Ñ?имÑ?ено"
 
 #: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr "_Ð?оÑ?аÑ?и поÑ?Ñ?ке"
+msgstr "Ð?оÑ?лаÑ?е поÑ?Ñ?ке"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Ð?елиÑ?ина"
 
 #: ../mail/message-list.etspec.h:19
-#, fuzzy
 msgid "Subject - Trimmed"
-msgstr "Ð?оÑ?е за _Ñ?емÑ?"
+msgstr "Ð?аÑ?лов - Ñ?кÑ?аÑ?ено"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Ð?озив"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ð?е пÑ?оÑ?леÑ?Ñ?Ñ?"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Следи"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
-msgstr "Ð?а ваÑ?Ñ? инÑ?оÑ?маÑ?иÑ?Ñ?"
+msgstr "Ð?а Ð?аÑ?Ñ? инÑ?оÑ?маÑ?иÑ?Ñ?"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Ð?Ñ?оÑ?леди"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Ð?иÑ?е неопÑ?одан одговоÑ?"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Ð?дговоÑ?и"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Ð?дговоÑ?и Ñ?вима"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Ð?Ñ?оÑ?иÑ?аÑ?и"
 
@@ -16351,39 +14917,37 @@ msgid "Subject contains"
 msgstr "Ð?аÑ?лов Ñ?адÑ?жи"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "Тема или пÑ?имаоÑ?и Ñ?адÑ?же"
+#| msgid "Subject or Sender contains"
+msgid "Subject or Addresses contains"
+msgstr "Ð?аÑ?лов или адÑ?еÑ?е Ñ?адÑ?же"
 
 #: ../mail/searchtypes.xml.h:7
+msgid "Subject or Recipients contains"
+msgstr "Ð?аÑ?лов или пÑ?имаоÑ?и Ñ?адÑ?же"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Ð?аÑ?лов или поÑ?иÑ?алаÑ? Ñ?адÑ?же"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Ð?окални имениÑ?и"
+#| msgid "List local address book folders"
+msgid "Add local address books to Evolution."
+msgstr "Ð?одаÑ?е локалне адÑ?еÑ?аÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Ð?безбеÑ?Ñ?Ñ?е оÑ?новнÑ? Ñ?Ñ?нкÑ?ионалноÑ?Ñ? за локалне именике."
+msgid "Local Address Books"
+msgstr "Ð?окални адÑ?еÑ?аÑ?и"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"СпиÑ?ак пÑ?едмеÑ?а за коÑ?има Ñ?е додаÑ?ак за подÑ?еÑ?аÑ?е Ñ?кÑ?Ñ?Ñ?иваÑ?а пÑ?илога Ñ?Ñ?агаÑ?и "
-"Ñ? Ñ?елÑ? поÑ?Ñ?ке"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr "СпиÑ?ак пÑ?едмеÑ?а за коÑ?има Ñ?е пÑ?икÑ?Ñ?Ñ?ак за подÑ?еÑ?аÑ?е Ñ?кÑ?Ñ?Ñ?иваÑ?а пÑ?илога Ñ?Ñ?агаÑ?и Ñ? Ñ?елÑ? поÑ?Ñ?ке"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"СпиÑ?ак пÑ?едмеÑ?а за коÑ?има Ñ?е пÑ?икÑ?Ñ?Ñ?ак за подÑ?еÑ?аÑ?е Ñ?кÑ?Ñ?Ñ?иваÑ?а пÑ?илога "
-"Ñ?Ñ?агаÑ?и Ñ? Ñ?елÑ? поÑ?Ñ?ке"
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "СпиÑ?ак пÑ?едмеÑ?а за коÑ?има Ñ?е пÑ?икÑ?Ñ?Ñ?ак за подÑ?еÑ?аÑ?е Ñ?кÑ?Ñ?Ñ?иваÑ?а пÑ?илога Ñ?Ñ?агаÑ?и Ñ? Ñ?елÑ? поÑ?Ñ?ке."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Ð?Ñ?Ñ?Ñ?не Ñ?еÑ?и"
 
@@ -16393,43 +14957,35 @@ msgid "Attachment Reminder"
 msgstr "Ð?одÑ?еÑ?ник на пÑ?илоге"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr ""
-"ТÑ?ага за пÑ?едмеÑ?има Ñ? коÑ?има Ñ?е може налазиÑ?и пÑ?илог Ñ? поÑ?Ñ?Ñ?и и Ñ?позоÑ?ава "
-"Ñ?колико пÑ?илога нема"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Ð?одÑ?еÑ?а када забоÑ?авиÑ?е да додаÑ?е пÑ?илог Ñ? поÑ?Ñ?кÑ?."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
-msgstr ""
-"Ð?волÑ?Ñ?иÑ?а Ñ?е пÑ?онаÑ?ла неке кÑ?Ñ?Ñ?не Ñ?еÑ?и коÑ?е наводе да би поÑ?Ñ?ка Ñ?Ñ?ебало да "
-"Ñ?адÑ?жи пÑ?илог, али иÑ?Ñ?и не може да пÑ?онаÑ?е."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?е пÑ?онаÑ?ла неке кÑ?Ñ?Ñ?не Ñ?еÑ?и коÑ?е наводе да би поÑ?Ñ?ка Ñ?Ñ?ебало да Ñ?адÑ?жи пÑ?илог, али иÑ?Ñ?и не може да пÑ?онаÑ?е."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
 msgstr "Ð?оÑ?Ñ?ка нема пÑ?илоге"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Ð?одаÑ? пÑ?илог..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_УÑ?еди поÑ?Ñ?кÑ?"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"Ð?одаÑ?ак за обликоваÑ?е коÑ?и пÑ?иказÑ?Ñ?е звÑ?Ñ?не пÑ?илоге Ñ?нÑ?Ñ?аÑ? поÑ?Ñ?ке и "
-"дозвоÑ?ава Ñ?иÑ?ово пÑ?Ñ?Ñ?аÑ?е диÑ?екÑ?но из еволÑ?Ñ?иÑ?е."
+#| msgid "Audio inline plugin"
+msgid "Audio Inline"
+msgstr "Ð?Ñ?дио Ñ?нÑ?Ñ?аÑ?"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Ð?одаÑ?ак за звÑ?к Ñ?нÑ?Ñ?аÑ? поÑ?Ñ?ке"
+msgid "Play audio attachments directly from Evolution."
+msgstr "Ð?Ñ?Ñ?Ñ?а аÑ?дио пÑ?илоге диÑ?екÑ?но из Ð?волÑ?Ñ?иÑ?е."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "Ð?забеÑ?иÑ?е име за Ñ?езеÑ?внÑ? копиÑ?Ñ? Ð?волÑ?Ñ?иÑ?е"
 
@@ -16450,163 +15006,152 @@ msgid "Restore from backup"
 msgstr "Ð?Ñ?аÑ?а из Ñ?езеÑ?вне копиÑ?е"
 
 #: ../plugins/backup-restore/backup-restore.c:289
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
-msgstr ""
-"Ð?волÑ?Ñ?иÑ?Ñ? можеÑ?е повÑ?аÑ?иÑ?и из Ñ?езеÑ?вне копиÑ?е. Ð?ожеÑ?е повÑ?аÑ?иÑ?и поÑ?Ñ?Ñ?, "
-"календаÑ?е, задÑ?жеÑ?а, белеÑ?ке, конÑ?акÑ?е.\n"
-"ТакоÑ?е Ñ?е  могÑ? повÑ?аÑ?иÑ?и Ñ?ва лиÑ?на подеÑ?аваÑ?а, Ñ?илÑ?еÑ?и за поÑ?Ñ?Ñ?, иÑ?д."
-
-#: ../plugins/backup-restore/backup-restore.c:295
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
+msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+msgstr "Ð?волÑ?Ñ?иÑ?Ñ? можеÑ?е повÑ?аÑ?иÑ?и из Ñ?езеÑ?вне копиÑ?е. Ð?ожеÑ?е повÑ?аÑ?иÑ?и поÑ?Ñ?Ñ?, календаÑ?е, задаÑ?ке, белеÑ?ке, конÑ?акÑ?е. ТакоÑ?е Ñ?е  могÑ? повÑ?аÑ?иÑ?и Ñ?ве лиÑ?не поÑ?Ñ?авке, Ñ?илÑ?еÑ?и за поÑ?Ñ?Ñ?, иÑ?д."
+
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Ð?овÑ?аÑ?и Ð?волÑ?Ñ?иÑ?Ñ? из даÑ?оÑ?еке Ñ?езеÑ?вне копиÑ?е"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Ð?забеÑ?иÑ?е аÑ?Ñ?ивÑ? Ð?волÑ?Ñ?иÑ?е за повÑ?аÑ?аÑ?:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ? за повÑ?аÑ?аÑ?"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за Ñ?езеÑ?вÑ? Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за повÑ?аÑ?аÑ? Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Ð?Ñ?овеÑ?ава Ñ?езеÑ?внÑ? копиÑ?Ñ? Ð?волÑ?Ñ?иÑ?е"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Ð?оново покÑ?еÑ?е Ð?волÑ?Ñ?иÑ?Ñ?"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Са гÑ?аÑ?иÑ?ком окÑ?Ñ?жеÑ?ем"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Ð?аÑ?еÑ?е Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
-msgstr "Ð?зÑ?аÑ?Ñ?Ñ?е Ñ?езеÑ?внÑ? копиÑ?Ñ? налога и подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
+msgstr "Ð?зÑ?аÑ?Ñ?Ñ?е Ñ?езеÑ?внÑ? копиÑ?Ñ? налога и поÑ?Ñ?авке Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Ð?зÑ?ада Ñ?езеÑ?вне копиÑ?е подаÑ?ака Ð?волÑ?Ñ?иÑ?е (поÑ?Ñ?а, календаÑ?и, задÑ?жеÑ?а, "
-"белеÑ?ке)"
+msgstr "Ð?зÑ?ада Ñ?езеÑ?вне копиÑ?е подаÑ?ака Ð?волÑ?Ñ?иÑ?е (поÑ?Ñ?а, календаÑ?и, задаÑ?и, белеÑ?ке)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Ð?зÑ?ада Ñ?езеÑ?вне копиÑ?е завÑ?Ñ?ена"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Ð?оновно покÑ?еÑ?аÑ?е Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Ð?зÑ?аÑ?Ñ?Ñ?е Ñ?езеÑ?внÑ? копиÑ?Ñ? Ñ?Ñ?енÑ?Ñ?ниÑ? подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Ð?Ñ?пакиваÑ?е даÑ?оÑ?ека из Ñ?езеÑ?вне копиÑ?е"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "УÑ?иÑ?ава подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "УклаÑ?аÑ?е пÑ?ивÑ?емениÑ? Ñ?езеÑ?вниÑ? даÑ?оÑ?ека"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Ð?Ñ?игÑ?Ñ?аÑ?е локалниÑ? извоÑ?а"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "СмеÑ?Ñ?а Ñ?езеÑ?внÑ? копиÑ?Ñ? Ñ? Ñ?аÑ?Ñ?иклÑ? %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Ð?Ñ?Ñ?и повÑ?аÑ?аÑ? из Ñ?аÑ?Ñ?икле %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "РезеÑ?вна копиÑ?а Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Ð?овÑ?аÑ?аÑ? Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Ð?зÑ?аÑ?Ñ?Ñ?е Ñ?езеÑ?внÑ? копиÑ?Ñ? подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "СаÑ?екаÑ?Ñ?е док Ð?волÑ?Ñ?иÑ?а пÑ?ави Ñ?езеÑ?внÑ? копиÑ?Ñ? подаÑ?ака."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Ð?овÑ?аÑ?аÑ? подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "СаÑ?екаÑ?Ñ?е док Ð?волÑ?Ñ?иÑ?а вÑ?аÑ?а подаÑ?ке Ñ? пÑ?вобиÑ?но Ñ?Ñ?аÑ?е."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ð?во може поÑ?Ñ?аÑ?аÑ?и, Ñ? завиÑ?ноÑ?Ñ?и од колиÑ?ине подаÑ?ака на налогÑ?."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Ð?одаÑ?ак за изÑ?адÑ? Ñ?езеÑ?ве и опоÑ?авак подаÑ?ака и подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#| msgid "Backup and restore plugin"
+msgid "Backup and Restore"
+msgstr "Ð?зÑ?ада Ñ?езеÑ?ве и опоÑ?авак"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Ð?одаÑ?ак за изÑ?адÑ? Ñ?езеÑ?ве и опоÑ?авак"
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Ð?Ñ?ави Ñ?езеÑ?вÑ? и опоÑ?авÑ?а подаÑ?ке и поÑ?Ñ?авке Ð?волÑ?Ñ?иÑ?е."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "СигÑ?Ñ?но желиÑ?е да заÑ?воÑ?иÑ?е Ð?волÑ?Ñ?иÑ?Ñ??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"СигÑ?Ñ?но желиÑ?е да повÑ?аÑ?иÑ?е Ð?волÑ?Ñ?иÑ?Ñ? из изабÑ?ане даÑ?оÑ?еке Ñ?езеÑ?вне копиÑ?е?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "СигÑ?Ñ?но желиÑ?е да повÑ?аÑ?иÑ?е Ð?волÑ?Ñ?иÑ?Ñ? из изабÑ?ане даÑ?оÑ?еке Ñ?езеÑ?вне копиÑ?е?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Ð?зÑ?ада Ñ?езеÑ?вне копиÑ?е може биÑ?и покÑ?енÑ?Ñ?а Ñ?амо када Ð?волÑ?Ñ?иÑ?а не Ñ?ади. Ð?Ñ?е "
-"него Ñ?Ñ?о наÑ?Ñ?авиÑ?е, пÑ?овеÑ?иÑ?е да ли Ñ?Ñ?е Ñ?аÑ?Ñ?вали и заÑ?воÑ?или Ñ?ве пÑ?озоÑ?е Ñ? "
-"коÑ?има Ñ?Ñ?е Ñ?адили. Уколико желиÑ?е да Ñ?е Ð?волÑ?Ñ?иÑ?а Ñ?ама покÑ?ене након "
-"завÑ?Ñ?еÑ?ка пÑ?оÑ?едÑ?Ñ?е, ознаÑ?иÑ?е овÑ? опÑ?иÑ?Ñ?."
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Ð?зÑ?ада Ñ?езеÑ?вне копиÑ?е може биÑ?и покÑ?енÑ?Ñ?а Ñ?амо када Ð?волÑ?Ñ?иÑ?а не Ñ?ади. Ð?Ñ?е него Ñ?Ñ?о наÑ?Ñ?авиÑ?е, пÑ?овеÑ?иÑ?е да ли Ñ?Ñ?е Ñ?аÑ?Ñ?вали и заÑ?воÑ?или Ñ?ве пÑ?озоÑ?е Ñ? коÑ?има Ñ?Ñ?е Ñ?адили. Уколико желиÑ?е да Ñ?е Ð?волÑ?Ñ?иÑ?а Ñ?ама покÑ?ене након завÑ?Ñ?еÑ?ка пÑ?оÑ?едÑ?Ñ?е, ознаÑ?иÑ?е овÑ? опÑ?иÑ?Ñ?."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16625,98 +15170,95 @@ msgid "The selected folder is not writable."
 msgstr "У изабÑ?анÑ? Ñ?аÑ?Ñ?иклÑ? Ñ?е не може пиÑ?аÑ?и."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
-msgstr ""
-"Ð?во Ñ?е обÑ?иÑ?аÑ?и Ñ?ве Ñ?Ñ?енÑ?Ñ?не подаÑ?ке и подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е и повÑ?аÑ?иÑ?и иÑ? "
-"из Ñ?езеÑ?вне копиÑ?е. Ð?ва пÑ?оÑ?едÑ?Ñ?а Ñ?е може покÑ?енÑ?Ñ?и Ñ?амо када Ð?волÑ?Ñ?иÑ?а не "
-"Ñ?ади. Ð?Ñ?е него Ñ?Ñ?о наÑ?Ñ?авиÑ?е, пÑ?овеÑ?иÑ?е да ли Ñ?Ñ?е заÑ?воÑ?или Ñ?ве пÑ?озоÑ?е Ñ? "
-"коÑ?има Ñ?Ñ?е Ñ?адили. Уколико желиÑ?е да Ñ?е Ð?волÑ?Ñ?иÑ?а Ñ?ама покÑ?ене након "
-"завÑ?Ñ?еÑ?ка пÑ?оÑ?едÑ?Ñ?е, ознаÑ?иÑ?е овÑ? опÑ?иÑ?Ñ?."
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr "Ð?во Ñ?е обÑ?иÑ?аÑ?и Ñ?ве Ñ?Ñ?енÑ?Ñ?не подаÑ?ке и поÑ?Ñ?авке Ð?волÑ?Ñ?иÑ?е и повÑ?аÑ?иÑ?и иÑ? из Ñ?езеÑ?вне копиÑ?е. Ð?ва пÑ?оÑ?едÑ?Ñ?а Ñ?е може покÑ?енÑ?Ñ?и Ñ?амо када Ð?волÑ?Ñ?иÑ?а не Ñ?ади. Ð?Ñ?е него Ñ?Ñ?о наÑ?Ñ?авиÑ?е, пÑ?овеÑ?иÑ?е да ли Ñ?Ñ?е заÑ?воÑ?или Ñ?ве пÑ?озоÑ?е Ñ? коÑ?има Ñ?Ñ?е Ñ?адили. Уколико желиÑ?е да Ñ?е Ð?волÑ?Ñ?иÑ?а Ñ?ама покÑ?ене након завÑ?Ñ?еÑ?ка пÑ?оÑ?едÑ?Ñ?е, ознаÑ?иÑ?е овÑ? опÑ?иÑ?Ñ?."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
-msgstr "Ð?Ñ?ави Ñ?езеÑ?вÑ? и опоÑ?авÑ?а подаÑ?ке и подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
+msgstr "Ð?Ñ?ави Ñ?езеÑ?вÑ? и опоÑ?авÑ?а подаÑ?ке и поÑ?Ñ?авке Ð?волÑ?Ñ?иÑ?е"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
-msgstr "Ð?п_оÑ?авÑ?а подеÑ?аваÑ?а..."
+msgstr "Ð?п_оÑ?авÑ?а поÑ?Ñ?авке..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
-msgstr "_Ð?зÑ?аÑ?Ñ?Ñ?е Ñ?езеÑ?вÑ? подеÑ?аваÑ?а..."
+msgstr "_Ð?зÑ?аÑ?Ñ?Ñ?е Ñ?езеÑ?вÑ? поÑ?Ñ?авки..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622
+#: ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки конÑ?акÑ?и"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "_Ð?Ñ?Ñ?омаÑ?Ñ?ки напÑ?ави Ñ?ноÑ?е Ñ? адÑ?еÑ?аÑ? пÑ?и одговаÑ?аÑ?Ñ? на поÑ?Ñ?ке"
+#: ../plugins/bbdb/bbdb.c:646
+#| msgid "_Auto-create address book entries when replying to messages"
+msgid "Create _address book entries when sending mails"
+msgstr "Ð?Ñ?ави Ñ?ноÑ?е Ñ? _адÑ?еÑ?аÑ? пÑ?и Ñ?лаÑ?Ñ? поÑ?Ñ?е"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
-msgstr "Ð?забеÑ?и именик за Ð?Ñ?Ñ?омаÑ?Ñ?ке конÑ?акÑ?е"
+msgstr "Ð?забеÑ?и адÑ?еÑ?аÑ? за Ð?Ñ?Ñ?омаÑ?Ñ?ке конÑ?акÑ?е"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Ð?Ñ?зе поÑ?Ñ?ке"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "УÑ?клаÑ?Ñ?Ñ?е подаÑ?ке о конÑ?акÑ?има и Ñ?ликама Ñ?а лиÑ?Ñ?ом дÑ?Ñ?гаÑ?а Ñ? Ð?иÑ?инÑ?"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Ð?иÑ?а адÑ?еÑ?аÑ? за Pidgin лиÑ?Ñ?Ñ? пÑ?иÑ?аÑ?еÑ?а"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "УÑ?клади Ñ?а _лиÑ?Ñ?ом дÑ?Ñ?гаÑ?а Ñ?ада"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"Ð?Ñ?Ñ?омаÑ?Ñ?ки попÑ?Ñ?ава адÑ?еÑ?аÑ? именима и адÑ?еÑ?ама е-поÑ?Ñ?е када одговаÑ?аÑ?е на "
-"поÑ?Ñ?ке. ТакоÑ?е попÑ?Ñ?ава подаÑ?ке за конÑ?акÑ? бÑ?зим глаÑ?ником из Ñ?пиÑ?ка дÑ?Ñ?гаÑ?а."
-
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#| msgid ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+msgstr ""
+"Ð?Ñ?лобаÑ?а Ð?аÑ? Ñ?еÑ?ког Ñ?ада Ñ? Ñ?пÑ?авÑ?аÑ?Ñ? адÑ?еÑ?аÑ?ом.\n"
+"\n"
+"Ð?Ñ?Ñ?омаÑ?Ñ?ки попÑ?Ñ?ава адÑ?еÑ?аÑ? именима и адÑ?еÑ?ама е-поÑ?Ñ?е када одговаÑ?аÑ?е на поÑ?Ñ?ке. ТакоÑ?е попÑ?Ñ?ава подаÑ?ке за конÑ?акÑ? бÑ?зим глаÑ?ником из Ñ?пиÑ?ка дÑ?Ñ?гаÑ?а."
+
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке Ñ? пÑ?ипÑ?еми %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Ð?авиÑ?ан пÑ?оÑ?еÑ? Ð?огоÑ?илÑ?еÑ?а не Ñ?еагÑ?Ñ?е, гаÑ?им..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ЧекаÑ?е на завиÑ?ан пÑ?оÑ?еÑ? Ð?огоÑ?илÑ?еÑ?а омеÑ?ено, пÑ?екидам..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Цев ка Ð?огоÑ?илÑ?еÑ?Ñ? Ñ?е пÑ?кла, ознака гÑ?еÑ?ке: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Ð?Ñ?ебаÑ?и Ñ?екÑ?Ñ? поÑ?Ñ?ке Ñ? _Уникод"
 
@@ -16725,81 +15267,125 @@ msgid "Convert mail messages to Unicode"
 msgstr "Ð?Ñ?ебаÑ?Ñ?Ñ?е поÑ?Ñ?ке поÑ?Ñ?е Ñ? Уникод"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Ð?Ñ?ебаÑ?Ñ?Ñ?е Ñ?екÑ?Ñ? поÑ?Ñ?ке Ñ? Уникод UTF-8 Ñ?ади обÑ?едиÑ?аваÑ?а spam/ham пÑ?едмеÑ?а "
-"Ñ?иÑ?и Ñ?Ñ? Ñ?зÑ?ок Ñ?азлиÑ?иÑ?и кодни Ñ?аÑ?поÑ?еди."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Ð?Ñ?ебаÑ?Ñ?Ñ?е Ñ?екÑ?Ñ? поÑ?Ñ?ке Ñ? Уникод UTF-8 Ñ?ади обÑ?едиÑ?аваÑ?а spam/ham пÑ?едмеÑ?а Ñ?иÑ?и Ñ?Ñ? Ñ?зÑ?ок Ñ?азлиÑ?иÑ?и кодни Ñ?аÑ?поÑ?еди."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Ð?пÑ?иÑ?е Ð?огоÑ?илÑ?еÑ?а"
+#| msgid "Bogofilter junk plugin"
+msgid "Bogofilter Junk Filter"
+msgstr "ФилÑ?еÑ? нежеÑ?ене поÑ?Ñ?е Ð?огоÑ?илÑ?еÑ?"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за нежеÑ?енÑ? поÑ?Ñ?Ñ? Ð?огоÑ?илÑ?еÑ?"
+msgid "Bogofilter Options"
+msgstr "Ð?пÑ?иÑ?е Ð?огоÑ?илÑ?еÑ?а"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "ФилÑ?Ñ?иÑ?а нежеÑ?енÑ? поÑ?Ñ?Ñ? коÑ?иÑ?Ñ?еÑ?ем Ð?огоÑ?илÑ?еÑ?а."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_Ð?дÑ?еÑ?а :"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?иÑ?Ñ?ованÑ? везÑ?"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "Ð?_Ñ?вежи:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "недеÑ?е"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV извоÑ?и календаÑ?а"
+msgid "Add CalDAV support to Evolution."
+msgstr "Ð?одаÑ?е подÑ?Ñ?кÑ? за CalDAV Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV извоÑ?и"
+#| msgid "CalDAV sources"
+msgid "CalDAV Support"
+msgstr "Ð?одÑ?Ñ?ка за CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:208
+#| msgid "Customize"
+msgid "_Customize options"
+msgstr "_Ð?Ñ?илагоди опÑ?иÑ?е"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+#| msgid "File name:"
+msgid "File _name:"
+msgstr "_Ð?ме даÑ?оÑ?еке:"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#| msgid "Choose a file"
+msgid "Choose calendar file"
+msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ? календаÑ?а"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#| msgid "Open"
+msgid "On open"
+msgstr "Ð?Ñ?и оÑ?ваÑ?аÑ?Ñ?"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "Ð?од измене даÑ?оÑ?еке"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../plugins/calendar-file/calendar-file.c:281
+#| msgid "Personal"
+msgid "Periodically"
+msgstr "Ð?еÑ?иодиÑ?но"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "ФоÑ?Ñ?иÑ?а _Ñ?амо за Ñ?иÑ?аÑ?е"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Ð?окални календаÑ?и"
+msgid "Add local calendars to Evolution."
+msgstr "Ð?одаÑ?е локалне календаÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Ð?аÑ?е оÑ?новнÑ? Ñ?поÑ?Ñ?ебÑ? локалним календаÑ?има."
+msgid "Local Calendars"
+msgstr "Ð?окални календаÑ?и"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Ð?оÑ?иÑ?Ñ?и Ñ?игÑ?Ñ?нÑ? везÑ?"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "Ð?оÑ?иÑ?ниÑ?ко_име:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP Ð?алендаÑ?и"
+msgid "Add web calendars to Evolution."
+msgstr "Ð?одаÑ?е веб календаÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Ð?аÑ?е оÑ?новнÑ? Ñ?поÑ?Ñ?ебÑ? http календаÑ?има и оним на вебÑ?."
+#| msgid "Calendars"
+msgid "Web Calendars"
+msgstr "Ð?еб календаÑ?и"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16841,80 +15427,76 @@ msgstr "Ð?Ñ?еме: гÑ?мÑ?авине"
 msgid "Select a location"
 msgstr "Ð?забеÑ?иÑ?е меÑ?Ñ?о"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Ð?единиÑ?е:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Ð?еÑ?Ñ?иÑ?не (ЦелзиÑ?Ñ?Ñ?, Ñ?м, иÑ?д.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Ð?мпеÑ?иÑ?алне (ФаÑ?енÑ?аÑ?Ñ?, инÑ?и, иÑ?д.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Ð?аÑ?е оÑ?новнÑ? Ñ?поÑ?Ñ?ебÑ? календаÑ?има вÑ?емена."
+msgid "Add weather calendars to Evolution."
+msgstr "Ð?одаÑ?е календаÑ?е за вÑ?еме Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Ð?алендаÑ?и вÑ?емена"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"Ð?Ñ?обни додаÑ?ак коÑ?и показÑ?Ñ?е иÑ?каÑ?Ñ?Ñ?и мени за Ñ?множаваÑ?е Ñ?Ñ?ваÑ?и Ñ? лиÑ?Ñ?Ñ? "
-"иÑ?еÑ?ака."
+#| msgid "Copy tool"
+msgid "Copy Tool"
+msgstr "Ð?лаÑ? за Ñ?множаваÑ?е"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Ð?лаÑ? за Ñ?множаваÑ?е"
+#| msgid "Copy selection to clipboard"
+msgid "Copy things to the clipboard."
+msgstr "Умножава Ñ?Ñ?ваÑ?и Ñ? Ñ?пиÑ?ак иÑ?еÑ?ака."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Ð?Ñ?овеÑ?и да ли Ñ?е Ð?волÑ?Ñ?иÑ?а подÑ?азÑ?мевани пÑ?огÑ?ам за поÑ?Ñ?Ñ?"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Сваки пÑ?Ñ? када Ñ?е Ð?волÑ?Ñ?иÑ?а покÑ?ене, пÑ?овеÑ?и да ли Ñ?е подÑ?азÑ?мевани пÑ?огÑ?ам "
-"за поÑ?Ñ?Ñ?."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Сваки пÑ?Ñ? када Ñ?е Ð?волÑ?Ñ?иÑ?а покÑ?ене, пÑ?овеÑ?и да ли Ñ?е подÑ?азÑ?мевани пÑ?огÑ?ам за поÑ?Ñ?Ñ?."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Ð?Ñ?и покÑ?еÑ?аÑ?Ñ? пÑ?овеÑ?ава да ли Ñ?е Ð?волÑ?Ñ?иÑ?а подÑ?азÑ?мевани клиÑ?енÑ? за поÑ?Ñ?Ñ?."
+#| msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Ð?Ñ?и покÑ?еÑ?аÑ?Ñ? пÑ?овеÑ?ава да ли Ñ?е Ð?волÑ?Ñ?иÑ?а подÑ?азÑ?мевани клиÑ?енÑ? за поÑ?Ñ?Ñ?."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "Ð?одÑ?азÑ?мевани клиÑ?енÑ?за поÑ?Ñ?Ñ? "
+#| msgid "Default Mail Client "
+msgid "Default Mail Client"
+msgstr "Ð?одÑ?азÑ?мевани клиÑ?енÑ? за поÑ?Ñ?Ñ? "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Ð?елиÑ?е ли да Ð?волÑ?Ñ?иÑ?Ñ? Ñ?Ñ?иниÑ?е подÑ?азÑ?меваним клиÑ?енÑ?ом е-поÑ?Ñ?е?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Ð?волÑ?Ñ?иÑ?а"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Ð?знаÑ?ава као _подÑ?азÑ?меван адÑ?еÑ?аÑ?"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "Ð?знаÑ?ава као _подÑ?азÑ?меван календаÑ?"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
-msgstr "Ð?знаÑ?ава као _подÑ?азÑ?меван Ñ?пиÑ?ак задÑ?жеÑ?а"
+msgstr "Ð?знаÑ?ава као _подÑ?азÑ?меван Ñ?пиÑ?ак задаÑ?ака"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "Ð?знаÑ?ава као _подÑ?азÑ?меван Ñ?пиÑ?ак белеÑ?ки"
 
@@ -16923,43 +15505,39 @@ msgid "Default Sources"
 msgstr "Ð?одÑ?азÑ?мевани извоÑ?и"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr ""
-"Ð?безбеÑ?Ñ?Ñ?е Ñ?Ñ?нкÑ?ионалноÑ?Ñ? за обележаваÑ?е неког календаÑ?а или именика као "
-"подÑ?азÑ?меваног."
+msgid "Mark your preferred address book and calendar as default."
+msgstr "Ð?знаÑ?ава омиÑ?ен адÑ?еÑ?аÑ? и календаÑ? као подÑ?азÑ?меване."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "СигÑ?Ñ?ноÑ?Ñ?:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Ð?еÑ?азвÑ?Ñ?Ñ?ано"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "Ð?аÑ?Ñ?иÑ?ено"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "ТаÑ?но"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "СÑ?Ñ?ого Ñ?аÑ?но"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_Ð?Ñ?илагоÑ?ено заглавÑ?е"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "Ð?Ñ?Ñ?Ñ?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Ð?Ñ?едноÑ?Ñ?и"
 
@@ -16978,8 +15556,9 @@ msgstr "Ð?Ñ?илагоÑ?ено заглавÑ?е е-поÑ?Ñ?е"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "Ð?одаÑ?е пÑ?илагоÑ?ено заглавÑ?е одлазним поÑ?Ñ?кама."
+#| msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Ð?одаÑ?е пÑ?илагоÑ?ена заглавÑ?а одлазним поÑ?Ñ?кама."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16990,14 +15569,8 @@ msgid "List of Custom Headers"
 msgstr "СпиÑ?ак пÑ?илагоÑ?ениÑ? заглавÑ?а"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"Ð?Ñ?Ñ?Ñ? наводи Ñ?пиÑ?ак пÑ?илагоÑ?ениÑ? заглавÑ?а коÑ?е можеÑ?е додаÑ?и одлазноÑ? поÑ?Ñ?Ñ?и. "
-"ФоÑ?маÑ? за навоÑ?еÑ?е заглавÑ?а и Ñ?егове вÑ?едноÑ?Ñ?и Ñ?е: назив пÑ?илагоÑ?еног "
-"заглавÑ?а, заÑ?им â??=â?? и вÑ?едноÑ?Ñ?и одвоÑ?ене Ñ?а â??;â??"
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgstr "Ð?Ñ?Ñ?Ñ? наводи Ñ?пиÑ?ак пÑ?илагоÑ?ениÑ? заглавÑ?а коÑ?е можеÑ?е додаÑ?и одлазноÑ? поÑ?Ñ?Ñ?и. ФоÑ?маÑ? за навоÑ?еÑ?е заглавÑ?а и Ñ?егове вÑ?едноÑ?Ñ?и Ñ?е: назив пÑ?илагоÑ?еног заглавÑ?а, заÑ?им â??=â?? и вÑ?едноÑ?Ñ?и одвоÑ?ене Ñ?а â??;â??"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -17022,30 +15595,22 @@ msgstr "СигÑ?Ñ?на лозинка"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Exchange Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем пÑ?иÑ?аве Ñ?игÑ?Ñ?ном "
-"лозинком (NTLM)."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Exchange Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем пÑ?иÑ?аве Ñ?игÑ?Ñ?ном лозинком (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "ТекÑ?Ñ?Ñ?ална лозинка"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Exchange Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем пÑ?иÑ?аве Ñ?екÑ?Ñ?Ñ?алном "
-"лозинком."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Exchange Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем пÑ?иÑ?аве Ñ?екÑ?Ñ?Ñ?алном лозинком."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Ð?ан канÑ?елаÑ?иÑ?е"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -17053,90 +15618,93 @@ msgstr ""
 "Ð?оле изабÑ?ана поÑ?Ñ?ка Ñ?е биÑ?и аÑ?Ñ?омаÑ?Ñ?ки поÑ?лаÑ?а Ñ?вакоÑ? оÑ?оби \n"
 "коÑ?а Ð?ам поÑ?аÑ?е поÑ?Ñ?Ñ? док Ñ?Ñ?е ван канÑ?елаÑ?иÑ?е."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Ð?иÑ?ам Ñ? канÑ?елаÑ?иÑ?и"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "У канÑ?елаÑ?иÑ?и Ñ?ам"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "УнеÑ?иÑ?е лозинкÑ? за налог Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Ð?змениÑ?е лозинкÑ?"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
-msgstr "УпÑ?авÑ?аÑ?Ñ?е подеÑ?аваÑ?има делегаÑ?а за налог Exchange"
+msgstr "УпÑ?авÑ?аÑ?Ñ?е поÑ?Ñ?авкама делегаÑ?а за налог Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Ð?омоÑ?ник за делегиÑ?аÑ?е"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Разно"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Ð?Ñ?егледаÑ? велиÑ?ине Ñ?виÑ? Exchange Ñ?аÑ?Ñ?икли"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Ð?елиÑ?ина Ñ?аÑ?Ñ?икли"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
-msgstr "Exchange подеÑ?аваÑ?а"
+msgstr "Exchange поÑ?Ñ?авке"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA адÑ?еÑ?а:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "Ð?_Ñ?Ñ?енÑ?иÑ?икÑ?Ñ?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "Ð?азив Ñ?андÑ?Ñ?еÑ?а Ñ?е _дÑ?Ñ?гаÑ?иÑ?и од коÑ?иÑ?ниÑ?ког имена"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_СандÑ?Ñ?е:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "Тип _аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "_Ð?Ñ?овеÑ?и подÑ?жане Ñ?ипове"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s Ð?Ð?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 Ð?Ð?"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Ð?елиÑ?ина:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17144,18 +15712,14 @@ msgid ""
 "Please switch to online mode for such operations."
 msgstr ""
 "Ð?волÑ?Ñ?иÑ?а ниÑ?е на мÑ?ежи. Сада не можеÑ?е ниÑ?и пÑ?авиÑ?и ниÑ?и меÑ?аÑ?и Ñ?аÑ?Ñ?икле.\n"
-"Ð?олим повежиÑ?е Ñ?е на мÑ?ежÑ? за Ñ?акве Ñ?адÑ?е."
+"Ð?овежиÑ?е Ñ?е на мÑ?ежÑ? за Ñ?акве Ñ?адÑ?е."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"ТÑ?енÑ?Ñ?на лозинка не одговаÑ?а поÑ?Ñ?оÑ?еÑ?оÑ? лозинки за оваÑ? налог. УнеÑ?иÑ?е "
-"иÑ?пÑ?авнÑ? лозинкÑ?"
+msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgstr "ТÑ?енÑ?Ñ?на лозинка не одговаÑ?а поÑ?Ñ?оÑ?еÑ?оÑ? лозинки за оваÑ? налог. УнеÑ?иÑ?е иÑ?пÑ?авнÑ? лозинкÑ?"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -17178,40 +15742,37 @@ msgid "Your current password has expired. Please change your password now."
 msgstr "ТÑ?енÑ?Ñ?на лозинка Ñ?е иÑ?Ñ?екла. Ð?змениÑ?е лозинкÑ? Ñ?ада."
 
 # bug(slobo): plural-forms
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Ð?Ñ?оÑ? дана након коÑ?иÑ? Ð?аÑ?а лозинка иÑ?Ñ?иÑ?е: %d"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Ð?Ñ?илагоÑ?ено"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "УÑ?еÑ?иваÑ? (Ñ?иÑ?а, пÑ?ави, Ñ?Ñ?еÑ?Ñ?Ñ?е)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Ð?Ñ?Ñ?оÑ? (Ñ?иÑ?а, пÑ?ави)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "РеÑ?ензенÑ? (Ñ?амо Ñ?иÑ?а)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Ð?елегиÑ?аÑ? овлаÑ?Ñ?еÑ?а"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Ð?влаÑ?Ñ?еÑ?а за %s"
@@ -17219,96 +15780,104 @@ msgstr "Ð?влаÑ?Ñ?еÑ?а за %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"Ð?вÑ? поÑ?Ñ?кÑ? Ñ?е Ð?волÑ?Ñ?иÑ?а аÑ?Ñ?омаÑ?Ñ?ки поÑ?лала да би Ð?аÑ? обавеÑ?Ñ?ила да Ñ?Ñ?е "
-"одÑ?еÑ?ени за делегаÑ?а. Сада можеÑ?е Ñ?лаÑ?и поÑ?Ñ?ке Ñ? моÑ?е име."
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
+msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
+msgstr "Ð?вÑ? поÑ?Ñ?кÑ? Ñ?е Ð?волÑ?Ñ?иÑ?а аÑ?Ñ?омаÑ?Ñ?ки поÑ?лала да би Ð?аÑ? обавеÑ?Ñ?ила да Ñ?Ñ?е одÑ?еÑ?ени за делегаÑ?а. Сада можеÑ?е Ñ?лаÑ?и поÑ?Ñ?ке Ñ? моÑ?е име."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "Ð?одеÑ?ена Ñ?Ñ? Ð?ам Ñ?ледеÑ?а овлаÑ?Ñ?еÑ?а на моÑ?им Ñ?аÑ?Ñ?иклама:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
-msgstr "ТакоÑ?е Ð?ам Ñ?е дозвоÑ?ено да видиÑ?е моÑ?е пÑ?иваÑ?не Ñ?Ñ?ваÑ?и."
+msgstr "ТакоÑ?е Ð?ам Ñ?е дозвоÑ?ено да видиÑ?е моÑ?е пÑ?иваÑ?не Ñ?Ñ?авке."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
-msgstr "Ð?иÑ?Ñ?е овлаÑ?Ñ?ени, меÑ?Ñ?Ñ?им, да видиÑ?е моÑ?е пÑ?иваÑ?не подаÑ?ке."
+msgstr "Ð?иÑ?Ñ?е овлаÑ?Ñ?ени, меÑ?Ñ?Ñ?им, да видиÑ?е моÑ?е пÑ?иваÑ?не Ñ?Ñ?авке."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "%s Ð?аÑ? Ñ?е одÑ?едио за Ñ?вог делегаÑ?а"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Ð?елегиÑ?аÑ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "УклониÑ?и делегаÑ?а %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?иÑ?Ñ?Ñ?пиÑ?и акÑ?ивном диÑ?екÑ?оÑ?иÑ?Ñ?мÑ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и Ñ?ебе Ñ? акÑ?ивном диÑ?екÑ?оÑ?иÑ?Ñ?мÑ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и делегаÑ?а %s Ñ? акÑ?ивном диÑ?екÑ?оÑ?иÑ?Ñ?мÑ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?клониÑ?и делегаÑ?а %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?вежиÑ?и лиÑ?Ñ?Ñ? делегаÑ?а."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и делегаÑ?а %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?иÑ?аÑ?Ñ? лиÑ?Ñ?е делегаÑ?а."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "Ð?_алендаÑ?:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "Ð?о_нÑ?акÑ?и: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Ð?елегаÑ?и"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"Ð?иÑ?Ñ?а\n"
+"Ð?Ñ?егледаÑ? (Ñ?амо-Ñ?иÑ?а)\n"
+"Ð?Ñ?Ñ?оÑ? (Ñ?иÑ?а, пÑ?ави)\n"
+"УÑ?еÑ?иваÑ? (Ñ?иÑ?а, пÑ?ави, Ñ?Ñ?еÑ?Ñ?Ñ?е)"
+
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Ð?влаÑ?Ñ?еÑ?а за"
 
@@ -17322,7 +15891,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "_Ð?елегаÑ?и могÑ? да виде лиÑ?не пÑ?едмеÑ?е"
+msgstr "_Ð?елегаÑ?и могÑ? да виде лиÑ?не Ñ?Ñ?авке"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -17331,12 +15900,13 @@ msgstr "_СандÑ?Ñ?е:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:18
 msgid "_Summarize permissions"
-msgstr "СаÑ?ини _пÑ?еглед овлаÑ?Ñ?еÑ?а"
+msgstr "СаÑ?ини _Ñ?ажеÑ?ак овлаÑ?Ñ?еÑ?а"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
-msgstr "Ð?а_дÑ?жеÑ?а:"
+msgstr "Ð?а_даÑ?и:"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
@@ -17354,11 +15924,11 @@ msgid "Folder Size"
 msgstr "Ð?елиÑ?ина Ñ?аÑ?Ñ?икле"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "Ð?оÑ?иÑ?ник"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Ð?Ñ?иÑ?ави Ñ?е на Ñ?аÑ?Ñ?иклÑ? дÑ?Ñ?гог коÑ?иÑ?ника"
@@ -17367,20 +15937,20 @@ msgstr "Ð?Ñ?иÑ?ави Ñ?е на Ñ?аÑ?Ñ?иклÑ? дÑ?Ñ?гог коÑ?иÑ?ник
 msgid "Exchange Folder Tree"
 msgstr "СÑ?абло Exchange Ñ?аÑ?Ñ?икли"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Ð?дÑ?ави Ñ?аÑ?Ñ?иклÑ?..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Ð?аиÑ?Ñ?а Ñ?е одÑ?авиÑ?и Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Ð?дÑ?ави Ñ?е Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??"
@@ -17405,12 +15975,10 @@ msgstr "<b>СÑ?аÑ?Ñ?Ñ?:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>Ð?оле изабÑ?ана поÑ?Ñ?ка Ñ?е биÑ?и аÑ?Ñ?омаÑ?Ñ?ки поÑ?лаÑ?а Ñ?вакоÑ? оÑ?оби коÑ?а Ð?ам "
-"поÑ?аÑ?е\n"
+"<small>Ð?оле изабÑ?ана поÑ?Ñ?ка Ñ?е биÑ?и аÑ?Ñ?омаÑ?Ñ?ки поÑ?лаÑ?а Ñ?вакоÑ? оÑ?оби коÑ?а Ð?ам поÑ?аÑ?е\n"
 "поÑ?Ñ?Ñ? док ниÑ?Ñ?е Ñ? канÑ?елаÑ?иÑ?и.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -17423,7 +15991,7 @@ msgstr "ТÑ?енÑ?Ñ?но ниÑ?ам Ñ? канÑ?елаÑ?иÑ?и"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
-msgstr "Ð?е, не меÑ?аÑ? Ñ?Ñ?аÑ?е"
+msgstr "Ð?е, не меÑ?аÑ? Ñ?Ñ?аÑ?Ñ?Ñ?"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
@@ -17439,7 +16007,7 @@ msgstr "УпозоÑ?еÑ?е о иÑ?Ñ?екÑ? лозинке..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "Ð?аÑ?а лозинке иÑ?Ñ?иÑ?е за 7 дана..."
+msgstr "Ð?аÑ?а лозинка иÑ?Ñ?иÑ?е за 7 дана..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -17447,18 +16015,18 @@ msgstr "Ð?змениÑ?е ло_зинкÑ?"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Ð?абÑ?аÑ?ен пÑ?иÑ?Ñ?Ñ?п.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Ð?одаÑ? коÑ?иÑ?ника:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Ð?одаÑ?е коÑ?иÑ?ника"
 
@@ -17476,7 +16044,7 @@ msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?едиÑ?и"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Create items"
-msgstr "Ð?Ñ?ави пÑ?едмеÑ?е"
+msgstr "Ð?Ñ?ави Ñ?Ñ?авке"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create subfolders"
@@ -17484,19 +16052,19 @@ msgstr "Ð?Ñ?ави подÑ?аÑ?Ñ?икле"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
-msgstr "Ð?бÑ?иÑ?и Ñ?ве пÑ?едмеÑ?е"
+msgstr "Ð?бÑ?иÑ?и Ñ?ве Ñ?Ñ?авке"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
-msgstr "Ð?бÑ?иÑ?и Ñ?воÑ?е пÑ?едмеÑ?е"
+msgstr "Ð?бÑ?иÑ?и Ñ?воÑ?е Ñ?Ñ?авке"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
-msgstr "УÑ?еди Ñ?ве пÑ?едмеÑ?е"
+msgstr "УÑ?еди Ñ?ве Ñ?Ñ?авке"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
-msgstr "УÑ?еди Ñ?воÑ?е пÑ?едмеÑ?е"
+msgstr "УÑ?еди Ñ?воÑ?е Ñ?Ñ?авке"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Folder contact"
@@ -17512,7 +16080,7 @@ msgstr "Ð?идÑ?ива Ñ?аÑ?Ñ?икла"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
-msgstr "Ð?Ñ?едмеÑ?и за Ñ?иÑ?аÑ?е"
+msgstr "СÑ?авке за Ñ?иÑ?аÑ?е"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Role: "
@@ -17520,7 +16088,7 @@ msgstr "Улога: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
-msgstr "<b>Ð?одеÑ?аваÑ?а поÑ?Ñ?ке</b>"
+msgstr "<b>Ð?оÑ?Ñ?авке поÑ?Ñ?ке</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:2
 msgid "<b>Tracking Options</b>"
@@ -17558,11 +16126,11 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:12
 msgid "Request a _delivery receipt for this message"
-msgstr "Ð?аÑ?Ñ?еваÑ?_пÑ?изнаниÑ?Ñ? да Ñ?е иÑ?поÑ?Ñ?Ñ?ена за овÑ? поÑ?Ñ?кÑ?"
+msgstr "Ð?аÑ?Ñ?еваÑ?_повÑ?аÑ?ниÑ?Ñ? да Ñ?е иÑ?поÑ?Ñ?Ñ?ена за овÑ? поÑ?Ñ?кÑ?"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:13
 msgid "Request a _read receipt for this message"
-msgstr "Ð?аÑ?Ñ?еваÑ? _пÑ?изнаниÑ?Ñ?  да Ñ?е пÑ?оÑ?иÑ?ана за овÑ? поÑ?Ñ?кÑ?"
+msgstr "Ð?аÑ?Ñ?еваÑ? _повÑ?аÑ?ниÑ?Ñ?  да Ñ?е пÑ?оÑ?иÑ?ана за овÑ? поÑ?Ñ?кÑ?"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
 msgid "Send as Delegate"
@@ -17576,13 +16144,13 @@ msgstr "_Ð?Ñ?еÑ?Ñ?ивоÑ?Ñ?: "
 msgid "_User"
 msgstr "_Ð?оÑ?иÑ?ник"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Ð?забеÑ?иÑ?е коÑ?иÑ?ника"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
-msgstr "Ð?меник..."
+msgstr "Ð?дÑ?еÑ?аÑ?..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -17593,12 +16161,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Ð?Ñ?иÑ?ави Ñ?е на календаÑ? дÑ?Ñ?гог коÑ?иÑ?ника"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"Ð?Ñ?икÑ?Ñ?Ñ?ак коÑ?и Ñ?Ñ?кÑ?Ñ?е збиÑ?ком наÑ?оÑ?иÑ?иÑ? Ñ?адÑ?и и Ñ?воÑ?Ñ?Ñ?ава над налозима за "
-"Exchange."
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "Ð?кÑ?ивиÑ?а пакеÑ? пÑ?оÑ?иÑ?еÑ?а Evolution-Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17606,7 +16170,7 @@ msgstr "Exchange Ñ?адÑ?е"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr ""
+msgstr "У Ñ?адÑ? ван мÑ?еже ниÑ?е могÑ?Ñ?е пÑ?иÑ?Ñ?Ñ?пиÑ?и Ñ?езиÑ?кÑ? â??Ð?одеÑ?аваÑ?а за Exchangeâ??."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
@@ -17621,12 +16185,8 @@ msgid "Cannot perform the operation."
 msgstr "Ð?пеÑ?аÑ?иÑ?а Ñ?е не може одÑ?адиÑ?и."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Ð?Ñ?омене Ñ? подеÑ?аваÑ?Ñ? Exchange налога â??{0}â?? Ñ?е наÑ?Ñ?Ñ?пиÑ?и након излаÑ?ка и "
-"поновног покÑ?еÑ?аÑ?а Ð?волÑ?Ñ?иÑ?е."
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+msgstr "Ð?Ñ?омене Ñ? подеÑ?аваÑ?Ñ? Exchange налога â??{0}â?? Ñ?е наÑ?Ñ?Ñ?пиÑ?и након излаÑ?ка и поновног покÑ?еÑ?аÑ?а Ð?волÑ?Ñ?иÑ?е."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
@@ -17692,9 +16252,7 @@ msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?вежиÑ?и Ñ?Ñ?аÑ?е за ван канÑ?е
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
-"Ð?оÑ?Ñ?ебно Ñ?е поново покÑ?енÑ?Ñ?и Ð?волÑ?Ñ?иÑ?Ñ? да би Ñ?е Ñ?Ñ?иÑ?ало Ñ?андÑ?Ñ?е пÑ?иÑ?авÑ?еног "
-"коÑ?иÑ?ника"
+msgstr "Ð?оÑ?Ñ?ебно Ñ?е поново покÑ?енÑ?Ñ?и Ð?волÑ?Ñ?иÑ?Ñ? да би Ñ?е Ñ?Ñ?иÑ?ало Ñ?андÑ?Ñ?е пÑ?иÑ?авÑ?еног коÑ?иÑ?ника"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
@@ -17745,7 +16303,7 @@ msgid "Folder offline"
 msgstr "ФаÑ?Ñ?икла ниÑ?е на мÑ?ежи"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Ð?пÑ?Ñ?а гÑ?еÑ?ка"
 
@@ -17754,12 +16312,8 @@ msgid "Global Catalog Server is not reachable"
 msgstr "СеÑ?веÑ? за опÑ?Ñ?и каÑ?алог ниÑ?е пÑ?иÑ?Ñ?Ñ?паÑ?ан."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Уколико OWA Ñ?ади на дÑ?Ñ?гоÑ? пÑ?Ñ?аÑ?и, моÑ?аÑ?е Ñ?е навеÑ?Ñ?и Ñ? диÑ?алогÑ? за "
-"подеÑ?аваÑ?е налога."
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgstr "Уколико OWA Ñ?ади на дÑ?Ñ?гоÑ? пÑ?Ñ?аÑ?и, моÑ?аÑ?е Ñ?е навеÑ?Ñ?и Ñ? диÑ?алогÑ? за подеÑ?аваÑ?е налога."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
@@ -17775,8 +16329,7 @@ msgstr "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е име Ñ?еÑ?веÑ?а иÑ?пÑ?авно
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Ð?Ñ?овеÑ?иÑ?е да ли Ñ?Ñ? коÑ?иÑ?ниÑ?ко име и лозинка иÑ?пÑ?авни и покÑ?Ñ?аÑ?Ñ?е поново."
+msgstr "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?Ñ? коÑ?иÑ?ниÑ?ко име и лозинка иÑ?пÑ?авни и покÑ?Ñ?аÑ?Ñ?е поново."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
@@ -17866,7 +16419,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Ð?епознаÑ?а гÑ?еÑ?ка Ñ? пÑ?оналажеÑ?Ñ? {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Ð?епознаÑ?а гÑ?еÑ?ка."
 
@@ -17880,14 +16435,11 @@ msgstr "Ð?пеÑ?аÑ?иÑ?а ниÑ?е подÑ?жана"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"Ð?Ñ?иближаваÑ?е Ñ?е ваÑ?оÑ? квоÑ?и коÑ?Ñ? имаÑ?е за Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е на овом Ñ?еÑ?веÑ?Ñ?."
+msgstr "Ð?Ñ?иближаваÑ?е Ñ?е ваÑ?оÑ? квоÑ?и коÑ?Ñ? имаÑ?е за Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е на овом Ñ?еÑ?веÑ?Ñ?."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "Ð?озвоÑ?ено Ð?ам Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке Ñ? име Ñ?амо Ñ?едног делегаÑ?а одÑ?едном."
+msgid "You are permitted to send a message on behalf of only one delegator at a time."
+msgstr "Ð?озвоÑ?ено Ð?ам Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке Ñ? име Ñ?амо Ñ?едног делегаÑ?а одÑ?едном."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
@@ -17902,28 +16454,16 @@ msgid "You may only configure a single Exchange account."
 msgstr "Ð?ожеÑ?е Ñ?амо да подеÑ?иÑ?е Ñ?едан Exchange налог."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"ТÑ?енÑ?Ñ?на иÑ?коÑ?иÑ?Ñ?еноÑ?Ñ? Ñ?е: {0} KB. Ð?Ñ?обаÑ?Ñ?е да оÑ?лободиÑ?е пÑ?оÑ?Ñ?оÑ? бÑ?иÑ?аÑ?ем "
-"некиÑ? поÑ?Ñ?ка."
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgstr "ТÑ?енÑ?Ñ?на иÑ?коÑ?иÑ?Ñ?еноÑ?Ñ? Ñ?е: {0} KB. Ð?Ñ?обаÑ?Ñ?е да оÑ?лободиÑ?е пÑ?оÑ?Ñ?оÑ? бÑ?иÑ?аÑ?ем некиÑ? поÑ?Ñ?ка."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"ТÑ?енÑ?Ñ?на иÑ?коÑ?иÑ?Ñ?еноÑ?Ñ? Ñ?е: {0} KB. Ð?д овог Ñ?Ñ?енÑ?Ñ?ка неÑ?еÑ?е моÑ?и ни да Ñ?аÑ?еÑ?е "
-"ни да пÑ?имаÑ?е поÑ?Ñ?Ñ?."
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgstr "ТÑ?енÑ?Ñ?на иÑ?коÑ?иÑ?Ñ?еноÑ?Ñ? Ñ?е: {0} KB. Ð?д овог Ñ?Ñ?енÑ?Ñ?ка неÑ?еÑ?е моÑ?и ни да Ñ?аÑ?еÑ?е ни да пÑ?имаÑ?е поÑ?Ñ?Ñ?."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"ТÑ?енÑ?Ñ?на иÑ?коÑ?иÑ?Ñ?еноÑ?Ñ? Ñ?е: {0} KB. Ð?еÑ?еÑ?е моÑ?и да Ñ?аÑ?еÑ?е поÑ?Ñ?Ñ? док не "
-"оÑ?лободиÑ?е пÑ?оÑ?Ñ?оÑ? бÑ?иÑ?аÑ?ем некиÑ? поÑ?Ñ?ка."
+msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
+msgstr "ТÑ?енÑ?Ñ?на иÑ?коÑ?иÑ?Ñ?еноÑ?Ñ? Ñ?е: {0} KB. Ð?еÑ?еÑ?е моÑ?и да Ñ?аÑ?еÑ?е поÑ?Ñ?Ñ? док не оÑ?лободиÑ?е пÑ?оÑ?Ñ?оÑ? бÑ?иÑ?аÑ?ем некиÑ? поÑ?Ñ?ка."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
@@ -17950,69 +16490,78 @@ msgid "Check folder permissions"
 msgstr "Ð?Ñ?овеÑ?и овлаÑ?Ñ?еÑ?а Ñ?аÑ?Ñ?икли"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки покÑ?ени Ñ?Ñ?еÑ?иваÑ? када Ñ?е пÑ?иÑ?иÑ?нÑ?Ñ? Ñ?аÑ?Ñ?еÑ? Ñ? Ñ?аÑ?Ñ?авÑ?аÑ?Ñ? поÑ?Ñ?ке"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки покÑ?ени пÑ?и Ñ?Ñ?еÑ?иваÑ?Ñ? нове поÑ?Ñ?ке"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Ð?одÑ?азÑ?мевани дÑ?Ñ?ги Ñ?Ñ?еÑ?иваÑ?"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "Ð?одÑ?азÑ?мевана наÑ?едба коÑ?а Ñ?е коÑ?иÑ?Ñ?и као Ñ?Ñ?еÑ?иваÑ?."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"Ð?одаÑ?ак за коÑ?иÑ?Ñ?еÑ?е дÑ?Ñ?гог Ñ?Ñ?еÑ?иваÑ?а за Ñ?аÑ?Ñ?авÑ?аÑ?е. Ð?ожеÑ?е Ñ?лаÑ?и Ñ?амо "
-"поÑ?Ñ?ке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "Ð?Ñ?Ñ?ги Ñ?Ñ?еÑ?иваÑ?"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#| msgid ""
+#| "A plugin for using an external editor as the composer. You can send only "
+#| "plain-text messages."
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?поÑ?ни Ñ?Ñ?еÑ?иваÑ? за Ñ?аÑ?Ñ?авÑ?аÑ?е поÑ?Ñ?ка Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ?"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "УÑ?еÑ?иваÑ? Ñ?е не покÑ?еÑ?е"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-msgstr ""
-"Ð?волÑ?Ñ?иÑ?а ниÑ?е могла да напÑ?ави пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ? за Ñ?Ñ?ваÑ?е поÑ?Ñ?е. "
-"Ð?окÑ?Ñ?аÑ?Ñ?е каÑ?ниÑ?е."
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr "Ð?волÑ?Ñ?иÑ?а ниÑ?е могла да напÑ?ави пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ? за Ñ?Ñ?ваÑ?е поÑ?Ñ?е. Ð?окÑ?Ñ?аÑ?Ñ?е каÑ?ниÑ?е."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"УÑ?еÑ?иваÑ? коÑ?е Ñ?Ñ?е навели Ñ? поÑ?Ñ?авкама додаÑ?ка ниÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и. "
-"Ð?окÑ?Ñ?аÑ?Ñ?е да наведеÑ?е дÑ?Ñ?ги Ñ?Ñ?еÑ?иваÑ?."
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#| msgid "External Editor"
+msgid "External editor still running"
+msgstr "СпоÑ?ни Ñ?Ñ?еÑ?иваÑ? Ñ?е Ñ?оÑ? акÑ?иван"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "СаÑ?Ñ?ави Ñ? _дÑ?Ñ?гом Ñ?Ñ?еÑ?иваÑ?Ñ?"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgstr "Ð?окÑ?енÑ?Ñ? Ñ?е Ñ?поÑ?ни Ñ?Ñ?еÑ?иваÑ?. Ð?Ñ?озоÑ? Ñ?аÑ?Ñ?авÑ?аÑ?а поÑ?Ñ?ке ниÑ?е могÑ?Ñ?е заÑ?воÑ?иÑ?и док Ñ?е акÑ?иван Ñ?Ñ?еÑ?иваÑ?."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "СаÑ?Ñ?авиÑ?е поÑ?Ñ?ке коÑ?иÑ?Ñ?еÑ?ем дÑ?Ñ?гог Ñ?Ñ?еÑ?иваÑ?а"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr "УÑ?еÑ?иваÑ? коÑ?е Ñ?Ñ?е навели Ñ? поÑ?Ñ?авкама додаÑ?ка ниÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и. Ð?окÑ?Ñ?аÑ?Ñ?е да наведеÑ?е дÑ?Ñ?ги Ñ?Ñ?еÑ?иваÑ?."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "Ð?аÑ?едба за извÑ?Ñ?аваÑ?е Ñ?ади покÑ?еÑ?аÑ?а Ñ?Ñ?еÑ?иваÑ?а:"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
+#| msgid ""
+#| "For Emacs use \"xemacs\"\n"
+#| "For VI use \"gvim\""
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Ð?а Ð?макÑ? коÑ?иÑ?Ñ?иÑ?е â??xemacsâ??\n"
-"Ð?а VI коÑ?иÑ?Ñ?иÑ?е â??gvimâ??"
+"Ð?а VI коÑ?иÑ?Ñ?иÑ?е â??gvim -fâ??"
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#| msgid "Compose in _External Editor"
+msgid "Compose in External Editor"
+msgstr "СаÑ?Ñ?авÑ?а Ñ? Ñ?поÑ?ном Ñ?Ñ?еÑ?иваÑ?Ñ?"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -18027,41 +16576,47 @@ msgid "_Face"
 msgstr "_Ð?иÑ?е"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#| msgid ""
+#| "Attach Face header to outgoing messages. First time the user needs to "
+#| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#| "evolution/faces This will be used in messages that are sent further."
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages."
 msgstr ""
-"Ð?Ñ?илаже заглавÑ?е Ñ? лиÑ?ем одлазним поÑ?Ñ?кама. Ð?оÑ?Ñ?ебно Ñ?е пÑ?ви пÑ?Ñ? да коÑ?иÑ?ник "
-"подеÑ?и 48*48 png Ñ?ликÑ?. Ð?на Ñ?е Ñ?иÑ?Ñ?иÑ?ана као base64  и Ñ?меÑ?Ñ?ена Ñ? ~/."
-"evolution/faces Ð?ао Ñ?аква Ñ?е биÑ?и коÑ?иÑ?Ñ?ена Ñ? поÑ?Ñ?кама коÑ?е Ñ?е надаÑ?е Ñ?аÑ?Ñ?."
+"Ð?Ñ?илаже Ñ?лиÑ?иÑ?Ñ? Ð?аÑ?ег лиÑ?а одлазним поÑ?Ñ?кама.\n"
+"\n"
+"Ð?оÑ?Ñ?ебно Ñ?е пÑ?ви пÑ?Ñ? да коÑ?иÑ?ник подеÑ?и PNG Ñ?ликÑ? 48*48. Ð?на Ñ?е Ñ?иÑ?Ñ?ована као bBase-64 и Ñ?меÑ?Ñ?ена Ñ? ~/.evolution/faces. Ð?ао Ñ?аква Ñ?е биÑ?и коÑ?иÑ?Ñ?ена Ñ? поÑ?Ñ?кама коÑ?е Ñ?е надаÑ?е Ñ?аÑ?Ñ?."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Ð?дÑ?ава Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-#, fuzzy
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-"Ð?озвоÑ?ава одÑ?авÑ? Ñ?аÑ?Ñ?икли за поÑ?Ñ?Ñ? Ñ? мениÑ?Ñ? деÑ?ним кликом на Ñ?Ñ?абло Ñ?аÑ?Ñ?икли."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Ð?дÑ?ави Ñ?аÑ?Ñ?икле"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "Ð?дÑ?авиÑ?е Ñ?е Ñ?а Ñ?аÑ?Ñ?икле IMAP деÑ?ним кликом на Ñ?Ñ?абло Ñ?аÑ?Ñ?икли."
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Ð?дÑ?ави Ñ?е"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"УнеÑ?иÑ?е лозинкÑ? за коÑ?иÑ?ника %s Ñ?ади пÑ?иÑ?Ñ?Ñ?па лиÑ?Ñ?и пÑ?иÑ?авÑ?ениÑ? календаÑ?а."
+msgstr "УнеÑ?иÑ?е лозинкÑ? за коÑ?иÑ?ника %s Ñ?ади пÑ?иÑ?Ñ?Ñ?па лиÑ?Ñ?и пÑ?иÑ?авÑ?ениÑ? календаÑ?а."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -18070,47 +16625,41 @@ msgstr ""
 "Ð?иÑ?е могÑ?Ñ?е пÑ?оÑ?иÑ?аÑ?и подаÑ?ке Ñ?а Ñ?еÑ?веÑ?а Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "Ð?ал_ендаÑ?:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "Ð?овÑ?Ñ?и _лиÑ?Ñ?Ñ?"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>СеÑ?веÑ?</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за поÑ?Ñ?авÑ?аÑ?е календаÑ?а и конÑ?акаÑ?а за google."
+msgid "Add Google Calendars to Evolution."
+msgstr "Ð?одаÑ?е Google календаÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Ð?звоÑ?и Google"
+#| msgid "Gnome Calendar"
+msgid "Google Calendars"
+msgstr "Google календаÑ?и"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "СпиÑ?ак"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Ð?одаÑ?ак за намеÑ?Ñ?аÑ?е извоÑ?а гÑ?Ñ?пниÑ? календаÑ?а и именика."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Ð?одаÑ?е подÑ?Ñ?кÑ? за Novell GroupWise Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "Ð?оÑ?Ñ?авÑ?аÑ?е GroupWise налога"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -18124,41 +16673,41 @@ msgid ""
 "Click 'Forward' to install the shared folder\n"
 "\n"
 msgstr ""
-"Ð?оÑ?иÑ?ник '%s' Ñ?е Ñ?а Ð?ама поделио Ñ?аÑ?Ñ?иклÑ?\n"
+"Ð?оÑ?иÑ?ник â??%sâ?? Ñ?е Ñ?а Ð?ама поделио Ñ?аÑ?Ñ?иклÑ?\n"
 "\n"
-"Ð?оÑ?Ñ?ка од '%s'\n"
+"Ð?оÑ?Ñ?ка од â??%sâ??\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Ð?ликниÑ?е 'Ð?апÑ?ед' Ñ?ади инÑ?Ñ?алаÑ?иÑ?е деÑ?ене Ñ?аÑ?Ñ?икле\n"
+"Ð?ликниÑ?е â??Ð?апÑ?едâ?? Ñ?ади инÑ?Ñ?алаÑ?иÑ?е деÑ?ене Ñ?аÑ?Ñ?икле\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Ð?нÑ?Ñ?алиÑ?аÑ? деÑ?енÑ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Ð?нÑ?Ñ?алаÑ?иÑ?а деÑ?ене Ñ?аÑ?Ñ?икле"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
-msgstr "Ð?одеÑ?аваÑ?а за Ñ?Ñ?бÑ?е"
+msgstr "Ð?оÑ?Ñ?авке за Ñ?Ñ?бÑ?е"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "Ð?одеÑ?аваÑ?а поÑ?Ñ?е за Ñ?Ñ?бÑ?е"
+msgstr "Ð?оÑ?Ñ?авке поÑ?Ñ?е за Ñ?Ñ?бÑ?е"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
-msgstr "Ð?одеÑ?аваÑ?а поÑ?Ñ?е за Ñ?Ñ?бÑ?е..."
+msgstr "Ð?оÑ?Ñ?авке поÑ?Ñ?е за Ñ?Ñ?бÑ?е..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
-msgstr "<b>Ð?ежеÑ?ене поÑ?Ñ?ке:</b>"
+msgstr "<b>СпиÑ?ак Ñ?Ñ?бÑ?еÑ?а:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -18175,25 +16724,21 @@ msgstr "_Ð?могÑ?Ñ?и"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "Ð?иÑ?Ñ?а за Ñ?Ñ?_бÑ?е"
+msgstr "СпиÑ?ак Ñ?_Ñ?бÑ?еÑ?а"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Ð?овлаÑ?еÑ?е поÑ?Ñ?ке"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
-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:57
+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:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Ð?оÑ?Ñ?ка повÑ?Ñ?ена Ñ?Ñ?пеÑ?но"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Ð?овÑ?Ñ?и поÑ?Ñ?Ñ?"
 
@@ -18202,94 +16747,121 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Ð?одаÑ? опÑ?иÑ?е Ñ?лаÑ?а GroupWise поÑ?Ñ?кама"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Ð?одаÑ?ак за могÑ?Ñ?ноÑ?Ñ?и GroupWise налога."
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "Фино подеÑ?иÑ?е налоге GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise могÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "Ð?овлаÑ?еÑ?е поÑ?Ñ?ке ниÑ?е Ñ?Ñ?пело"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "СеÑ?веÑ? ниÑ?е дозволио повлаÑ?еÑ?е изабÑ?ане поÑ?Ñ?ке."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Ð?алог имена &quot;{0}&quot; веÑ? поÑ?Ñ?оÑ?и. Ð?Ñ?овеÑ?иÑ?е Ñ?Ñ?абло Ñ?аÑ?Ñ?икли."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Ð?алог веÑ? поÑ?Ñ?оÑ?и"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Ð?еиÑ?пÑ?аван коÑ?иÑ?ник"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "Ð?Ñ?иÑ?ава на поÑ?Ñ?едника као &quot;{0}&quot; ниÑ?е била Ñ?Ñ?пеÑ?на. Ð?Ñ?овеÑ?иÑ?е адÑ?еÑ?Ñ? е-поÑ?Ñ?е и покÑ?Ñ?аÑ?Ñ?е поново."
+
 # 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-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Ð?оÑ?иÑ?никÑ? &quot;{0}&quot; не може биÑ?и додеÑ?ен пÑ?иÑ?Ñ?Ñ?п поÑ?Ñ?едникÑ?"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "Ð?забеÑ?иÑ?е коÑ?иÑ?ника"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Ð?еÑ? имаÑ?е овлаÑ?Ñ?еÑ?а за поÑ?Ñ?едника за овог коÑ?иÑ?ника."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Ð?оÑ?аÑ?е навеÑ?Ñ?и иÑ?пÑ?авно коÑ?иÑ?ниÑ?ко име за даваÑ?е пÑ?ава пÑ?иÑ?Ñ?Ñ?па поÑ?Ñ?едникÑ?."
+msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и иÑ?пÑ?авно коÑ?иÑ?ниÑ?ко име за даваÑ?е пÑ?ава пÑ?иÑ?Ñ?Ñ?па поÑ?Ñ?едникÑ?."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Ð?алог имена &quot;{0}&quot; веÑ? поÑ?Ñ?оÑ?и. Ð?Ñ?овеÑ?иÑ?е Ñ?Ñ?абло Ñ?аÑ?Ñ?икли."
+#: ../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;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "Ð?алог веÑ? поÑ?Ñ?оÑ?и"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и име коÑ?иÑ?ника коÑ?ег желиÑ?е да додаÑ?е на Ñ?пиÑ?ак"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Ð?Ñ?иÑ?ава на поÑ?Ñ?едника као &quot;{0}&quot; ниÑ?е била Ñ?Ñ?пеÑ?на. Ð?Ñ?овеÑ?иÑ?е "
-"адÑ?еÑ?Ñ? е-поÑ?Ñ?е и покÑ?Ñ?аÑ?Ñ?е поново."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
+msgstr "Ð?елиÑ?е ли поново да поÑ?аÑ?еÑ?е Ñ?аÑ?Ñ?анак ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Ð?елиÑ?е ли поново да поÑ?аÑ?еÑ?е Ñ?аÑ?Ñ?анак коÑ?и Ñ?е понавÑ?а ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#| msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgid "Do you want to retract the original item ?"
+msgstr "Ð?елиÑ?е ли да повÑ?Ñ?еÑ?е оÑ?игиналнÑ? Ñ?Ñ?авкÑ? ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "Ð?Ñ?игинал Ñ?е биÑ?и Ñ?клоÑ?ен из поÑ?Ñ?анÑ?ког Ñ?андÑ?Ñ?еÑ?а пÑ?имаоÑ?а."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "Ð?ваÑ? Ñ?аÑ?Ñ?анак Ñ?е понавÑ?а"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "Ð?во Ñ?е напÑ?авиÑ?и нови Ñ?аÑ?Ñ?анак коÑ?иÑ?Ñ?еÑ?ем деÑ?аÑ?а поÑ?Ñ?оÑ?еÑ?иÑ? Ñ?аÑ?Ñ?анака. "
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgstr "Ð?во Ñ?е напÑ?авиÑ?и нови Ñ?аÑ?Ñ?анак Ñ?а деÑ?аÑ?има поÑ?Ñ?оÑ?еÑ?иÑ? Ñ?аÑ?Ñ?анака. Ð?Ñ?авило за понавÑ?аÑ?е моÑ?аÑ?е Ñ?неÑ?и поново."
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "Ð?Ñ?иÑ?ваÑ?аÑ?е?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "Ð?дбиÑ?аÑ?е?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-#, fuzzy
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Ð?е можеÑ?е поделиÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ?а наведеним коÑ?иÑ?ником &quot;{0}&quot;."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-#, fuzzy
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Ð?оÑ?аÑ?е навеÑ?Ñ?и киме коÑ?иÑ?ника коÑ?ег желиÑ?е да додаÑ?е на лиÑ?Ñ?Ñ?"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Ð?Ñ?иÑ?ваÑ?и Ñ?з Ñ?езеÑ?вÑ?"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#| msgid "_Delegate Meeting..."
+msgid "Rese_nd Meeting..."
+msgstr "Ð?оново _Ñ?аÑ?и Ñ?аÑ?Ñ?анак..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Ð?оÑ?иÑ?ниÑ?и:</b>"
@@ -18303,7 +16875,7 @@ msgid "Con_tacts..."
 msgstr "Ð?он_Ñ?акÑ?и..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Ð?оÑ?Ñ?ка"
 
@@ -18349,7 +16921,7 @@ msgstr "Ð?змени _Ñ?аÑ?Ñ?икле/опÑ?иÑ?е/пÑ?авила/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr "ЧиÑ?аÑ? пÑ?едмеÑ?е ознаÑ?ене као _лиÑ?но"
+msgstr "ЧиÑ?аÑ? Ñ?Ñ?авке ознаÑ?ене као _лиÑ?но"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
@@ -18388,10 +16960,10 @@ msgstr "<b>Ð?ме налога</b>"
 msgid "Proxy Login"
 msgstr "Ð?Ñ?иÑ?ава за мÑ?ежног поÑ?Ñ?едника"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУнеÑ?иÑ?е лозинкÑ? за %s (коÑ?иÑ?ник %s)"
@@ -18399,122 +16971,119 @@ msgstr "%sУнеÑ?иÑ?е лозинкÑ? за %s (коÑ?иÑ?ник %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "Ð?Ñ?иÑ?ава за мÑ?ежног _поÑ?Ñ?едника..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"Ð?езиÑ?ак за мÑ?ежног поÑ?Ñ?едника Ñ?е биÑ?и доÑ?Ñ?Ñ?пан Ñ?амо када налог бÑ?де на мÑ?ежи."
+msgstr "Ð?езиÑ?ак за мÑ?ежног поÑ?Ñ?едника Ñ?е биÑ?и доÑ?Ñ?Ñ?пан Ñ?амо када налог бÑ?де на мÑ?ежи."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"Ð?езиÑ?ак за мÑ?ежног поÑ?Ñ?едника Ñ?е биÑ?и доÑ?Ñ?Ñ?пан Ñ?амо када налог бÑ?де омогÑ?Ñ?ен."
+msgstr "Ð?езиÑ?ак за мÑ?ежног поÑ?Ñ?едника Ñ?е биÑ?и доÑ?Ñ?Ñ?пан Ñ?амо када налог бÑ?де омогÑ?Ñ?ен."
 
 #: ../plugins/groupwise-features/send-options.c:214
-#, fuzzy
 msgid "Advanced send options"
-msgstr "УмеÑ?ни напÑ?едне могÑ?Ñ?ноÑ?Ñ?и Ñ?лаÑ?а"
+msgstr "Ð?апÑ?едне опÑ?иÑ?е Ñ?лаÑ?а"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Ð?оÑ?иÑ?ниÑ?и"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "УнеÑ?иÑ?е коÑ?иÑ?нике и поÑ?Ñ?авиÑ?е овлаÑ?Ñ?еÑ?а"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "Ð?ова _деÑ?ена Ñ?аÑ?Ñ?икла..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Ð?еÑ?еÑ?е"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "Ð?Ñ?илагоÑ?ено обавеÑ?Ñ?еÑ?е"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Ð?одаÑ? "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Ð?змени"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "СÑ?аÑ?Ñ?Ñ? поÑ?Ñ?ке"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Ð?аÑ?лов:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "ШаÑ?е:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Ð?аÑ?Ñ?м пÑ?авÑ?еÑ?а:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Ð?Ñ?ималаÑ?:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Ð?Ñ?поÑ?Ñ?Ñ?ено:"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Ð?Ñ?воÑ?ено:"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Ð?Ñ?иÑ?ваÑ?ено:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Ð?бÑ?иÑ?ано:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Ð?дбиÑ?ено:"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Ð?авÑ?Ñ?ено:"
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Ð?еиÑ?поÑ?Ñ?Ñ?ено:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Ð?Ñ?аÑ?и Ñ?Ñ?аÑ?Ñ?Ñ? поÑ?Ñ?ке..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Ð?одаÑ?ак за намеÑ?Ñ?аÑ?е Ð¥Ñ?линиÑ? извоÑ?а календаÑ?а."
+msgid "Add Hula support to Evolution."
+msgstr "Ð?одаÑ?е подÑ?Ñ?кÑ? за Hula Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Ð?одеÑ?аваÑ?е Ð¥Ñ?ла налога"
+msgid "Hula Support"
+msgstr "Ð?одÑ?Ñ?ка за Hula"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Ð?Ñ?илагоÑ?ена заглавÑ?а"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP заглавÑ?а"
 
@@ -18531,20 +17100,14 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Ð?Ñ?новна и заглавÑ?а _Ð?опиÑ?ниÑ? лиÑ?Ñ?а (Ð?одÑ?азÑ?мевано)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Ð?Ñ?ибави Ñ?_ва заглавÑ?а"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Ð?оказÑ?Ñ?е додаÑ?на заглавÑ?а коÑ?а Ñ?е поÑ?Ñ?ебно пÑ?еÑ?зеÑ?и заÑ?едно Ñ?а Ñ?Ñ?андаÑ?дним "
-"заглавÑ?има. \n"
-"Ð?збоÑ?ом \"Сва заглавÑ?а\" ово можеÑ?е игноÑ?иÑ?аÑ?и."
+"Ð?оказÑ?Ñ?е додаÑ?на заглавÑ?а коÑ?а Ñ?е поÑ?Ñ?ебно пÑ?еÑ?зеÑ?и заÑ?едно Ñ?а Ñ?Ñ?андаÑ?дним заглавÑ?има. \n"
+"Ð?збоÑ?ом â??Сва заглавÑ?аâ?? ово можеÑ?е игноÑ?иÑ?аÑ?и."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18552,7 +17115,7 @@ msgstr ""
 "Ð?забеÑ?иÑ?е поÑ?Ñ?авке IMAP заглавÑ?а. \n"
 "ШÑ?о виÑ?е заглавÑ?а имаÑ?е виÑ?е Ñ?е вÑ?емена биÑ?и поÑ?Ñ?ебно за Ñ?иÑ?ово пÑ?еÑ?зимаÑ?е."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18560,71 +17123,34 @@ msgstr ""
 "_Ð?Ñ?новна заглавÑ?а - (Ð?аÑ?бÑ?же) \n"
 "Ð?оÑ?иÑ?Ñ?иÑ?е ово Ñ?колико немаÑ?е Ñ?илÑ?еÑ?е на допиÑ?ним лиÑ?Ñ?ама"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#| msgid "Fetch A_ll Headers"
+msgid "_Fetch All Headers"
+msgstr "_Ð?Ñ?ибави Ñ?ва заглавÑ?а"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "Ð?одаÑ?ак за могÑ?Ñ?ноÑ?Ñ?и IMAP налога."
+msgid "Fine-tune your IMAP accounts."
+msgstr "Фино подеÑ?иÑ?е IMAP налоге."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP могÑ?Ñ?ноÑ?Ñ?и"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "Ð?звез_и Ñ? календаÑ?"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "Увези Ñ? _задÑ?жеÑ?а"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Увези Ð?нÑ?еÑ?неÑ? календаÑ?"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Ð?забеÑ?иÑ?_е Ñ?пиÑ?ак задÑ?жеÑ?а"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Ð?забеÑ?иÑ?е календаÑ?"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "У_воз"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Увези Ñ? календаÑ?"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "Увози ICS пÑ?илоге Ñ? календаÑ?."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "СлоÑ? Ñ?аÑ?двеÑ?Ñ?ке апÑ?Ñ?Ñ?акÑ?иÑ?е ниÑ?е Ñ?Ñ?иÑ?ан"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"СеÑ?виÑ? \"hald\"  Ñ?е неопÑ?одан али ниÑ?е Ñ?Ñ?енÑ?Ñ?но акÑ?иван. УкÑ?Ñ?Ñ?иÑ?е Ñ?еÑ?виÑ? и "
-"поново покÑ?ениÑ?е пÑ?огÑ?ам, или конÑ?акÑ?иÑ?аÑ?Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?а Ñ?иÑ?Ñ?ема."
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr "СеÑ?виÑ? â??haldâ??  Ñ?е неопÑ?одан али ниÑ?е Ñ?Ñ?енÑ?Ñ?но акÑ?иван. УкÑ?Ñ?Ñ?иÑ?е Ñ?еÑ?виÑ? и поново покÑ?ениÑ?е пÑ?огÑ?ам, или конÑ?акÑ?иÑ?аÑ?Ñ?е админиÑ?Ñ?Ñ?аÑ?оÑ?а Ñ?иÑ?Ñ?ема."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "ТÑ?ажеÑ?е iPod Ñ?Ñ?еÑ?аÑ?а ниÑ?е Ñ?Ñ?пело"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Ð?волÑ?Ñ?иÑ?а ниÑ?е пÑ?онаÑ?ла iPod Ñ?ади Ñ?Ñ?клаÑ?иваÑ?а. УÑ?еÑ?аÑ? или ниÑ?е пÑ?икÑ?Ñ?Ñ?ен на "
-"Ñ?иÑ?Ñ?ем или ниÑ?е Ñ?кÑ?Ñ?Ñ?ен."
+msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
+msgstr "Ð?волÑ?Ñ?иÑ?а ниÑ?е пÑ?онаÑ?ла iPod Ñ?ади Ñ?Ñ?клаÑ?иваÑ?а. УÑ?еÑ?аÑ? или ниÑ?е пÑ?икÑ?Ñ?Ñ?ен на Ñ?иÑ?Ñ?ем или ниÑ?е Ñ?кÑ?Ñ?Ñ?ен."
 
 #: ../plugins/ipod-sync/ical-format.c:119
 #: ../plugins/save-calendar/ical-format.c:164
@@ -18632,210 +17158,196 @@ msgid "iCalendar format (.ics)"
 msgstr "иÐ?алендаÑ? облик (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"УÑ?клаÑ?Ñ?Ñ?е изабÑ?ано задÑ?жеÑ?е/белеÑ?кÑ?/календаÑ?/адÑ?еÑ?аÑ? Ñ?а Ñ?епним Ñ?Ñ?еÑ?аÑ?ем "
-"Apple iPod"
+msgid "Synchronize to iPod"
+msgstr "УÑ?клади Ñ?а iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "УÑ?клади Ñ?а iPod Ñ?епним Ñ?Ñ?еÑ?аÑ?ем"
+#| msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
+msgstr "УÑ?клаÑ?Ñ?Ñ?е подаÑ?ке Ñ?а Apple iPod."
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "_УÑ?клаÑ?иваÑ?е Ñ?а iPod Ñ?епним Ñ?Ñ?еÑ?аÑ?ем"
+msgstr "_УÑ?клаÑ?иваÑ?е Ñ?а iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е календаÑ?а â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
-"Ð?едан заказани Ñ?аÑ?Ñ?анак Ñ? календаÑ?Ñ? â??%sâ?? Ñ?е Ñ? иÑ?Ñ?о вÑ?еме кад и оваÑ? Ñ?Ñ?Ñ?Ñ?еÑ?"
+msgstr "Ð?едно заказиваÑ?е Ñ? календаÑ?Ñ? â??%sâ?? Ñ?е Ñ? иÑ?Ñ?о вÑ?еме кад и оваÑ? Ñ?аÑ?Ñ?анак"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "Ð?аказани Ñ?аÑ?Ñ?анак Ñ?е пÑ?онаÑ?ен Ñ? календаÑ?Ñ? â??%sâ??"
+msgstr "Ð?аказиваÑ?е Ñ?е пÑ?онаÑ?ено Ñ? календаÑ?Ñ? â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
-msgstr "Ð?е могÑ? да пÑ?онаÑ?ем ниÑ?едан календаÑ?"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и ниÑ?едан календаÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
-msgstr "Ð?е могÑ? пÑ?онаÑ?и оваÑ? Ñ?Ñ?Ñ?Ñ?еÑ? Ñ? ниÑ?едном календаÑ?Ñ?"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и оваÑ? Ñ?аÑ?Ñ?анак ни Ñ? Ñ?едном календаÑ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
-msgstr "Ð?е могÑ? пÑ?онаÑ?и ово задÑ?жеÑ?е Ñ? ниÑ?едном Ñ?пиÑ?кÑ? задÑ?жеÑ?а"
+msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и оваÑ? задаÑ?ак ни Ñ? Ñ?едном Ñ?пиÑ?кÑ? задаÑ?ака"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "Ð?иÑ?едан Ñ?пиÑ?ак белеÑ?ки не Ñ?адÑ?жи овÑ? белеÑ?кÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#| msgid "Opening calendar"
+msgid "Opening the calendar. Please wait.."
+msgstr "Ð?Ñ?ваÑ?аÑ?е календаÑ?а. СаÑ?екаÑ?Ñ?е..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
-msgstr "Ð?Ñ?еÑ?Ñ?ага Ñ?едне поÑ?Ñ?оÑ?еÑ?е веÑ?зиÑ?е овог Ñ?аÑ?Ñ?анка Ñ?е Ñ? Ñ?окÑ?"
+msgstr "Ð?Ñ?еÑ?Ñ?ага Ñ?едне поÑ?Ñ?оÑ?еÑ?е веÑ?зиÑ?е овог заказиваÑ?а Ñ?е Ñ? Ñ?окÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
-msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада пÑ?едмеÑ?а"
+msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада Ñ?Ñ?авке"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е пÑ?едмеÑ?а календаÑ?Ñ? â??%sâ??.  %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е Ñ?Ñ?авке календаÑ?Ñ? â??%sâ??.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? као пÑ?иÑ?ваÑ?ено"
+msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? као пÑ?иÑ?ваÑ?ено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? Ñ?з Ñ?езеÑ?вÑ?"
+msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? Ñ?з Ñ?езеÑ?вÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? као одбиÑ?ено"
+msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? као одбиÑ?ено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Ð?оÑ?лаÑ?о календаÑ?Ñ? â??%sâ?? као оÑ?казано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Ð?Ñ?ганизаÑ?оÑ? Ñ?е Ñ?клонио делегаÑ?а %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Ð?елегаÑ?Ñ? Ñ?е поÑ?лаÑ?о обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ð?иÑ?е могÑ?Ñ?е поÑ?лаÑ?и обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ? делегаÑ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "СÑ?аÑ?е Ñ?Ñ?еÑ?ника ниÑ?е оÑ?вежено због неиÑ?пÑ?авног Ñ?Ñ?аÑ?а"
+msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ника ниÑ?е ажÑ?Ñ?иÑ?ано због неиÑ?пÑ?авног Ñ?Ñ?аÑ?а"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?вежаваÑ?е за Ñ?Ñ?еÑ?ника. %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е ажÑ?Ñ?иÑ?аÑ?и Ñ?Ñ?еÑ?ника. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
-msgstr "СÑ?аÑ?е Ñ?Ñ?еÑ?ника Ñ?е оÑ?вежено"
+msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ника Ñ?е ажÑ?Ñ?иÑ?ан"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "Ð?одаÑ?ак о Ñ?аÑ?Ñ?анкÑ? поÑ?лаÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
-msgstr "Ð?одаÑ?ак о задÑ?жеÑ?Ñ? поÑ?лаÑ?"
+msgstr "Ð?одаÑ?ак о задаÑ?кÑ? поÑ?лаÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "Ð?одаÑ?ак о белеÑ?Ñ?и поÑ?лаÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е подаÑ?ака о Ñ?аÑ?Ñ?анкÑ?, Ñ?аÑ?Ñ?анак не поÑ?Ñ?оÑ?и"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е подаÑ?ка о задÑ?жеÑ?Ñ?, задÑ?жеÑ?е не поÑ?Ñ?оÑ?и"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е подаÑ?ка о задаÑ?кÑ?, задÑ?жеÑ?е не поÑ?Ñ?оÑ?и"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е подаÑ?ака о белеÑ?Ñ?и, белеÑ?ка не поÑ?Ñ?оÑ?и"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Ð?Ñ?иложен календаÑ? ниÑ?е иÑ?пÑ?аван"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Ð?оÑ?Ñ?ка пÑ?иÑ?авÑ?Ñ?Ñ?е календаÑ?, али Ñ?аÑ? календаÑ? ниÑ?е иÑ?пÑ?аван иÐ?алендаÑ?."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
-msgstr "Ð?Ñ?едмеÑ? Ñ? календаÑ?Ñ? ниÑ?е иÑ?пÑ?аван"
+msgstr "СÑ?авка Ñ? календаÑ?Ñ? ниÑ?е иÑ?пÑ?авна"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
-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:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "Ð?оÑ?Ñ?ка Ñ?адÑ?жи календаÑ?, али он не Ñ?адÑ?жи догаÑ?аÑ?е, задаÑ?ке или Ñ?лободно/заÑ?зеÑ?о подаÑ?ке."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
-msgstr "Ð?алендаÑ? Ñ? пÑ?илогÑ? Ñ?адÑ?жи виÑ?е пÑ?едмеÑ?а"
+msgstr "Ð?алендаÑ? Ñ? пÑ?илогÑ? Ñ?адÑ?жи виÑ?е Ñ?Ñ?авки"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Ради обÑ?аде Ñ?виÑ? овиÑ? пÑ?едмеÑ?а, поÑ?Ñ?ебно Ñ?е даÑ?оÑ?екÑ? Ñ?аÑ?Ñ?ваÑ?и а календаÑ? "
-"Ñ?веÑ?Ñ?и"
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "Ради обÑ?аде Ñ?виÑ? овиÑ? Ñ?Ñ?авки, поÑ?Ñ?ебно Ñ?е даÑ?оÑ?екÑ? Ñ?аÑ?Ñ?ваÑ?и а календаÑ? Ñ?веÑ?Ñ?и"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "Ð?ваÑ? Ñ?е Ñ?аÑ?Ñ?анак понавÑ?а"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
-msgstr "Ð?во Ñ?е задÑ?жеÑ?еÑ?е понавÑ?а"
+msgstr "Ð?ваÑ? Ñ?е задаÑ?ак Ñ?е понавÑ?а"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "Ð?ва Ñ?е белеÑ?ка понавÑ?а"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Ð?бÑ?иÑ?и поÑ?Ñ?кÑ? након Ñ?адÑ?е"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Табела пÑ?еÑ?Ñ?аге за пÑ?еклапаÑ?има"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Ð?иÑ?а календаÑ?е за пÑ?еÑ?Ñ?агÑ? пÑ?еклапаÑ?а Ñ? Ñ?аÑ?Ñ?анÑ?има"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "Ð?анаÑ?"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18854,11 +17366,6 @@ msgstr "Ð?анаÑ? %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "Ð?анаÑ? %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "СÑ?Ñ?Ñ?а"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19000,12 +17507,12 @@ msgstr "Ð?Ñ?имÑ?ено Ñ? име <b>%s</b>"
 #: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> пÑ?еко %s обÑ?ави Ñ?ледеÑ?и подаÑ?ак о Ñ?аÑ?Ñ?анкÑ?:"
+msgstr "<b>%s</b> пÑ?еко %s обÑ?авÑ?Ñ?Ñ?е Ñ?ледеÑ?и подаÑ?ак о Ñ?аÑ?Ñ?анкÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> обÑ?ави Ñ?ледеÑ?и подаÑ?ак о Ñ?аÑ?Ñ?анкÑ?:"
+msgstr "<b>%s</b> обÑ?авÑ?Ñ?Ñ?е Ñ?ледеÑ?и подаÑ?ак о Ñ?аÑ?Ñ?анкÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
@@ -19034,16 +17541,12 @@ msgstr "<b>%s</b> жели да дода поÑ?Ñ?оÑ?еÑ?ем Ñ?аÑ?Ñ?анкÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> пÑ?еко %s жели да пÑ?ими наÑ?новиÑ?е инÑ?оÑ?маÑ?иÑ?е за Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> пÑ?еко %s жели да пÑ?ими наÑ?новиÑ?е инÑ?оÑ?маÑ?иÑ?е за Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> жели да пÑ?ими наÑ?новиÑ?и подаÑ?ак за Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
@@ -19054,17 +17557,17 @@ msgstr "<b>%s</b> пÑ?еко %s Ñ?аÑ?е Ñ?ледеÑ?и одговоÑ? за Ñ?а
 #: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> поÑ?ла Ñ?ледеÑ?и одговоÑ? за Ñ?аÑ?Ñ?анак:"
+msgstr "<b>%s</b> Ñ?аÑ?е Ñ?ледеÑ?и одговоÑ? за Ñ?аÑ?Ñ?анак:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> пÑ?еко %s оÑ?каза Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак:"
+msgstr "<b>%s</b> пÑ?еко %s оÑ?казÑ?Ñ?е Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак:"
 
 #: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> оÑ?каза Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак."
+msgstr "<b>%s</b> оÑ?казÑ?Ñ?е Ñ?ледеÑ?и Ñ?аÑ?Ñ?анак."
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
@@ -19074,22 +17577,22 @@ msgstr "<b>%s</b> пÑ?еко %s пÑ?едлаже Ñ?ледеÑ?е пÑ?омене 
 #: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> пÑ?едложи Ñ?ледеÑ?е пÑ?омене Ñ?аÑ?Ñ?анка."
+msgstr "<b>%s</b> пÑ?едлаже Ñ?ледеÑ?е пÑ?омене Ñ?аÑ?Ñ?анка."
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> пÑ?еко %s одби Ñ?ледеÑ?е пÑ?омене Ñ?аÑ?Ñ?анка:"
+msgstr "<b>%s</b> пÑ?еко %s одбиÑ?а Ñ?ледеÑ?е пÑ?омене Ñ?аÑ?Ñ?анка:"
 
 #: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> одби Ñ?ледеÑ?е пÑ?омене Ñ?аÑ?Ñ?анка."
+msgstr "<b>%s</b> одбиÑ?а Ñ?ледеÑ?е пÑ?омене Ñ?аÑ?Ñ?анка."
 
 #: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> пÑ?еко %s обÑ?ави Ñ?ледеÑ?е задÑ?жеÑ?е:"
+msgstr "<b>%s</b> пÑ?еко %s обÑ?авÑ?Ñ?Ñ?е Ñ?ледеÑ?и задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
@@ -19099,96 +17602,87 @@ msgstr "<b>%s</b> обÑ?ави Ñ?ледеÑ?е задÑ?жеÑ?е:"
 #: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> заÑ?Ñ?ева да %s пÑ?еÑ?зме Ñ?ледеÑ?е задÑ?жеÑ?е:"
+msgstr "<b>%s</b> заÑ?Ñ?ева да %s пÑ?еÑ?зме Ñ?ледеÑ?и задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> пÑ?еко %s Ð?ам додели задÑ?жеÑ?е:"
+msgstr "<b>%s</b> пÑ?еко %s Ð?ам додеÑ?Ñ?Ñ?е задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> Ð?ам додели задÑ?жеÑ?е:"
+msgstr "<b>%s</b> Ð?ам додеÑ?Ñ?Ñ?е задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b пÑ?еко %s жели да дода поÑ?Ñ?оÑ?еÑ?ем задÑ?жеÑ?Ñ?:"
+msgstr "<b>%s</b> пÑ?еко %s жели да дода поÑ?Ñ?оÑ?еÑ?ем задаÑ?кÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b жели да дода поÑ?Ñ?оÑ?еÑ?ем задÑ?жеÑ?Ñ?:"
+msgstr "<b>%s</b жели да дода поÑ?Ñ?оÑ?еÑ?ем задаÑ?кÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> пÑ?еко %s жели да добиÑ?е наÑ?новиÑ?е инÑ?оÑ?маÑ?иÑ?е за Ñ?ледеÑ?е додеÑ?ено "
-"задÑ?жеÑ?е:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> пÑ?еко %s жели да добиÑ?е наÑ?новиÑ?е инÑ?оÑ?маÑ?иÑ?е за Ñ?ледеÑ?и додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> жели да добиÑ?е наÑ?новиÑ?е инÑ?оÑ?маÑ?иÑ?е за Ñ?ледеÑ?е додеÑ?ено задÑ?жеÑ?е:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> жели да добиÑ?е наÑ?новиÑ?е инÑ?оÑ?маÑ?иÑ?е за Ñ?ледеÑ?и додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> пÑ?еко %s вÑ?аÑ?а Ñ?ледеÑ?и одговоÑ? на додеÑ?ено задÑ?жеÑ?е:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> пÑ?еко %s вÑ?аÑ?а Ñ?ледеÑ?и одговоÑ? на додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> поÑ?ла назад Ñ?ледеÑ?и одговоÑ? на додеÑ?ено задÑ?жеÑ?е:"
+msgstr "<b>%s</b> Ñ?аÑ?е назад Ñ?ледеÑ?и одговоÑ? на додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> пÑ?еко %s оÑ?каза Ñ?ледеÑ?е додеÑ?ено задÑ?жеÑ?е:"
+msgstr "<b>%s</b> пÑ?еко %s оÑ?казÑ?Ñ?е Ñ?ледеÑ?и додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> оÑ?каза Ñ?ледеÑ?е додеÑ?ено задÑ?жеÑ?е:"
+msgstr "<b>%s</b> оÑ?казÑ?Ñ?е Ñ?ледеÑ?и додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> пÑ?еко %s пÑ?едлаже Ñ?ледеÑ?е пÑ?омене Ñ? додели задÑ?жеÑ?а:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> пÑ?еко %s пÑ?едлаже Ñ?ледеÑ?е пÑ?омене Ñ? додели задаÑ?ка:"
 
 #: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> пÑ?едложи Ñ?ледеÑ?е пÑ?омене Ñ? додели задÑ?жеÑ?а:"
+msgstr "<b>%s</b> пÑ?едлаже Ñ?ледеÑ?е пÑ?омене Ñ? додели задаÑ?ка:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> пÑ?еко %s одби Ñ?ледеÑ?е додеÑ?ено задÑ?жеÑ?е:"
+msgstr "<b>%s</b> пÑ?еко %s одбиÑ?а Ñ?ледеÑ?и додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> одби Ñ?ледеÑ?е додеÑ?ено задÑ?жеÑ?е:"
+msgstr "<b>%s</b> одбиÑ?а Ñ?ледеÑ?и додеÑ?ени задаÑ?ак:"
 
 #: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> пÑ?еко %s обÑ?ави Ñ?ледеÑ?Ñ? белеÑ?кÑ?:"
+msgstr "<b>%s</b> пÑ?еко %s обÑ?авÑ?Ñ?Ñ?е Ñ?ледеÑ?Ñ? белеÑ?кÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> обÑ?ави Ñ?ледеÑ?Ñ? белеÑ?кÑ?:"
+msgstr "<b>%s</b> обÑ?авÑ?Ñ?Ñ?е Ñ?ледеÑ?Ñ? белеÑ?кÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
@@ -19203,140 +17697,132 @@ msgstr "<b>%s</b> жели да дода поÑ?Ñ?оÑ?еÑ?оÑ? белеÑ?Ñ?и:"
 #: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> пÑ?еко %s оÑ?каза Ñ?ледеÑ?Ñ? деÑ?енÑ? белеÑ?кÑ?:"
+msgstr "<b>%s</b> пÑ?еко %s оÑ?казÑ?Ñ?е Ñ?ледеÑ?Ñ? деÑ?енÑ? белеÑ?кÑ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> оÑ?каза Ñ?ледеÑ?е деÑ?енÑ? белеÑ?кÑ?:"
+msgstr "<b>%s</b> оÑ?казÑ?Ñ?е Ñ?ледеÑ?е деÑ?енÑ? белеÑ?кÑ?:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Ð?Ñ?воÑ?и календаÑ?"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_Ð?дбиÑ?"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Ð?дбиÑ?"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "Ð?Ñ?и_Ñ?ваÑ?и"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "Ð?д_биÑ? Ñ?ве"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "Све Ñ?а Ñ?е_зеÑ?вом"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "Са _Ñ?езеÑ?вом"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "Ð?_Ñ?иÑ?ваÑ?и Ñ?ве"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "Ð?оÑ?аÑ?и подаÑ?_ке"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
-msgstr "Ð?Ñ?вежи Ñ?Ñ?аÑ?е Ñ?Ñ?еÑ?ни_ка"
+msgstr "Ð?жÑ?Ñ?иÑ?аÑ? Ñ?Ñ?аÑ?е Ñ?Ñ?еÑ?ни_ка"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
-msgstr "Ð?Ñ?_вежи"
+msgstr "_Ð?жÑ?Ñ?иÑ?аÑ?"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Ð?Ñ?еме поÑ?еÑ?ка:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Ð?Ñ?еме завÑ?Ñ?еÑ?ка:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
-msgstr "Ð?апомена:"
+msgstr "Ð?оменÑ?аÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "_Ð?дговоÑ?и поÑ?иÑ?аоÑ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
-msgstr "Ð?оÑ?аÑ?и о_Ñ?вежене подаÑ?ке Ñ?Ñ?еÑ?ниÑ?има"
+msgstr "Ð?оÑ?аÑ?и _ажÑ?Ñ?иÑ?ане подаÑ?ке Ñ?Ñ?еÑ?ниÑ?има"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "Ð?Ñ?и_мени на Ñ?ве нивое"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Ð?Ñ?икажи вÑ?еме као _Ñ?лободно"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
-msgstr ""
+msgstr "_Ð?Ñ?Ñ?ваÑ? моÑ? подÑ?еÑ?ник"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
-msgstr "Ð?одÑ?еÑ?ник на пÑ?илоге"
-
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "Ð?а_дÑ?жеÑ?а:"
+msgstr "_Ð?аÑ?леди подÑ?еÑ?ник"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "Ð?елеÑ?ке :"
+#| msgid "_Memos"
+msgid "_Memos:"
+msgstr "_Ð?елеÑ?ке:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "Ð?Ñ?иказÑ?Ñ?е делове Ñ?екÑ?Ñ?а/календаÑ?а Ñ? поÑ?Ñ?кама."
+#| msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Ð?Ñ?иказÑ?Ñ?е MIME делове â??text/calendarâ?? Ñ? поÑ?Ñ?кама."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
-msgstr "Itip обликоваÑ?е"
+msgstr "Itip Ñ?оÑ?маÑ?иÑ?аÑ?е"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; делегиÑ?а Ñ?аÑ?Ñ?анак. Ð?елиÑ?е ли да додаÑ?е делегаÑ?а &quot;{1}"
-"&quot; ?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
+msgstr "&quot;{0}&quot; делегиÑ?а Ñ?аÑ?Ñ?анак. Ð?елиÑ?е ли да додаÑ?е делегаÑ?а &quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Ð?ваÑ? Ñ?аÑ?Ñ?анак Ñ?е делегиÑ?ан"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Ð?ваÑ? одговоÑ? ниÑ?е поÑ?лао пÑ?иÑ?Ñ?Ñ?ан Ñ?Ñ?еÑ?ник. Ð?одаÑ?и га Ñ? пÑ?иÑ?Ñ?Ñ?не?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -19344,13 +17830,13 @@ msgid "Proxy _Logout"
 msgstr "_Ð?дÑ?ава Ñ?а мÑ?ежног поÑ?Ñ?едника"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Ð?озвоÑ?ава иÑ?кÑ?Ñ?Ñ?иваÑ?е налога."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?и налог"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "Ð?немогÑ?Ñ?ава налог деÑ?ним кликом на Ñ?Ñ?абло Ñ?аÑ?Ñ?икли."
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "СвиÑ?а или пÑ?Ñ?Ñ?а звÑ?Ñ?нÑ? даÑ?оÑ?екÑ?."
@@ -19372,20 +17858,16 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "СÑ?ваÑ?а D-BUS поÑ?Ñ?кÑ? када Ñ?Ñ?игне нова поÑ?Ñ?а."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"СвиÑ?не ако Ñ?е поÑ?Ñ?авÑ?ено на â??trueâ?? (Ñ?аÑ?но), а инаÑ?е пÑ?Ñ?Ñ?а звÑ?Ñ?нÑ? даÑ?оÑ?екÑ? "
-"када Ñ?Ñ?игне нова поÑ?Ñ?ка."
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgstr "СвиÑ?не ако Ñ?е поÑ?Ñ?авÑ?ено на â??trueâ?? (Ñ?аÑ?но), а инаÑ?е пÑ?Ñ?Ñ?а звÑ?Ñ?нÑ? даÑ?оÑ?екÑ? када Ñ?Ñ?игне нова поÑ?Ñ?ка."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
-msgstr "Ð?бавеÑ?Ñ?ава Ñ?амо за нове поÑ?Ñ?ке Ñ? пÑ?иÑ?емном Ñ?андÑ?Ñ?еÑ?Ñ?."
+msgstr "Ð?бавеÑ?Ñ?ава Ñ?амо за нове поÑ?Ñ?ке Ñ? СандÑ?Ñ?еÑ?Ñ?."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
-msgstr "Ð?Ñ?Ñ?Ñ?а звÑ?Ñ?нÑ? даÑ?оÑ?екÑ? када Ñ?Ñ?игне нова поÑ?Ñ?ка."
+msgstr "Ð?Ñ?Ñ?Ñ?а звÑ?к када Ñ?Ñ?игне нова поÑ?Ñ?ка."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
@@ -19393,8 +17875,7 @@ msgstr "Ð?Ñ?каÑ?Ñ?Ñ?а поÑ?Ñ?ка Ñ?а иконом."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Ð?Ñ?иказÑ?Ñ?е иконÑ? за новÑ? поÑ?Ñ?Ñ? Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони када Ñ?Ñ?игне нова поÑ?Ñ?ка."
+msgstr "Ð?Ñ?иказÑ?Ñ?е иконÑ? за новÑ? поÑ?Ñ?Ñ? Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони када Ñ?Ñ?игне нова поÑ?Ñ?ка."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -19402,13 +17883,11 @@ msgstr "Ð?ме даÑ?оÑ?еке за пÑ?Ñ?Ñ?аÑ?е."
 
 #: ../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 ""
-"Ð?вÑ?Ñ?на даÑ?оÑ?ека за пÑ?Ñ?Ñ?аÑ?е када Ñ?Ñ?игне нова поÑ?Ñ?ка, Ñ?колико ниÑ?е Ñ?кÑ?Ñ?Ñ?ено "
-"обавеÑ?Ñ?еÑ?е Ñ?иÑ?еном."
+msgstr "Ð?вÑ?Ñ?на даÑ?оÑ?ека за пÑ?Ñ?Ñ?аÑ?е када Ñ?Ñ?игне нова поÑ?Ñ?ка, Ñ?колико ниÑ?е Ñ?кÑ?Ñ?Ñ?ено обавеÑ?Ñ?еÑ?е Ñ?иÑ?еном."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Ð?а ли да пÑ?Ñ?Ñ?и звÑ?Ñ?нÑ? даÑ?оÑ?екÑ? или Ñ?виÑ?не када Ñ?Ñ?игне нова поÑ?Ñ?ка."
+msgstr "Ð?а ли да пÑ?Ñ?Ñ?и звÑ?к или Ñ?виÑ?не када Ñ?Ñ?игне нова поÑ?Ñ?ка."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
@@ -19420,22 +17899,22 @@ msgstr "Ð?а ли да икона Ñ?Ñ?епÑ?е или не."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
-msgstr "Ð?а ли да обавеÑ?Ñ?и о новоÑ? поÑ?Ñ?Ñ?и Ñ?амо за пÑ?иÑ?емно Ñ?андÑ?Ñ?е."
+msgstr "Ð?а ли да обавеÑ?Ñ?и о новоÑ? поÑ?Ñ?Ñ?и Ñ?амо за СандÑ?Ñ?е."
 
-#: ../plugins/mail-notification/mail-notification.c:260
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "СÑ?ваÑ?а _D-Bus поÑ?Ñ?кÑ?"
 
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Ð?волÑ?Ñ?иÑ?ино обавеÑ?Ñ?еÑ?е о поÑ?Ñ?и"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
-msgstr "Ð?оÑ?Ñ?авке обавеÑ?Ñ?еÑ?а о поÑ?Ñ?и"
+msgstr "Ð?одеÑ?аваÑ?а обавеÑ?Ñ?еÑ?а о поÑ?Ñ?и"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19453,7 +17932,7 @@ msgstr[2] ""
 "Ð?Ñ?имили Ñ?Ñ?е %d новиÑ? поÑ?Ñ?ка\n"
 "Ñ? %s."
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19461,110 +17940,206 @@ msgstr[0] "Ð?Ñ?имили Ñ?Ñ?е %d новÑ? поÑ?Ñ?кÑ?."
 msgstr[1] "Ð?Ñ?имили Ñ?Ñ?е %d нове поÑ?Ñ?ке."
 msgstr[2] "Ð?Ñ?имили Ñ?Ñ?е %d новиÑ? поÑ?Ñ?ка."
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Ð?ова поÑ?Ñ?ка"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "Ð?Ñ?иказÑ?Ñ?е иконÑ? Ñ? _обавеÑ?Ñ?аÑ?ноÑ? зони"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "ТÑ?е_пеÑ?и икона Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони "
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "Ð?Ñ?икажи _поÑ?Ñ?кÑ? заÑ?едно Ñ?а иконом"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "_Ð?Ñ?Ñ?Ñ?и звÑ?к када Ñ?Ñ?игне нова поÑ?Ñ?ка"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_СвиÑ?ни"
 
-#: ../plugins/mail-notification/mail-notification.c:763
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Ð?Ñ?Ñ?Ñ?и _звÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Ð?дÑ?еди име _даÑ?оÑ?еке:"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
-msgstr "Ð?забеÑ?иÑ?е звÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
+msgstr "Ð?иÑ?а звÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
 
-#: ../plugins/mail-notification/mail-notification.c:776
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "Ð?Ñ?_Ñ?Ñ?и"
 
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
-msgstr "Ð?бавеÑ?Ñ?и о новим поÑ?Ñ?кама Ñ?амо за _пÑ?иÑ?емно Ñ?андÑ?Ñ?е"
+msgstr "Ð?бавеÑ?Ñ?и о новим поÑ?Ñ?кама Ñ?амо за _СандÑ?Ñ?е"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr ""
-"СÑ?ваÑ?а D-Bus поÑ?Ñ?кÑ? или обавеÑ?Ñ?ава коÑ?иÑ?ника иконом Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони и "
-"обавеÑ?Ñ?еÑ?ем када Ñ?Ñ?игне нова поÑ?Ñ?ка."
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Ð?бавеÑ?Ñ?еÑ?е о поÑ?Ñ?и"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
-"Ð?одаÑ?ак коÑ?и омогÑ?Ñ?ава пÑ?авÑ?еÑ?е Ñ?аÑ?Ñ?анака из Ñ?адÑ?жаÑ?а елекÑ?Ñ?онÑ?ке поÑ?Ñ?ке."
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#| msgid "Play sound when new messages arrive."
+msgid "Notifies you when new mail messages arrive."
+msgstr "Ð?бавеÑ?Ñ?ава Ð?аÑ? када Ñ?Ñ?игне нова поÑ?Ñ?ка."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
+msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgstr "Ð?забÑ?ани календаÑ? веÑ? Ñ?адÑ?жи догаÑ?аÑ? â??%sâ??. Ð?елиÑ?е ли да Ñ?Ñ?едиÑ?е Ñ?Ñ?аÑ?и догаÑ?аÑ??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgstr "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи задаÑ?ак â??%sâ??. Ð?елиÑ?е ли да Ñ?Ñ?едиÑ?е Ñ?Ñ?аÑ?и задаÑ?ак?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgstr "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи белеÑ?кÑ? â??%sâ??. Ð?елиÑ?е ли да Ñ?Ñ?едиÑ?е Ñ?Ñ?аÑ?Ñ? белеÑ?кÑ??"
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
+msgstr "Ð?забÑ?ани календаÑ? веÑ? Ñ?адÑ?жи неке догаÑ?аÑ?е за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи неке задаÑ?ке за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
+msgstr "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи неке белеÑ?ке за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Ð?Ñ?оме_ни Ñ? Ñ?аÑ?Ñ?анак"
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
+msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
+msgstr[0] "Ð?забÑ?ани календаÑ? веÑ? Ñ?адÑ?жи догаÑ?аÑ? за даÑ?Ñ? поÑ?Ñ?кÑ?. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нови?"
+msgstr[1] "Ð?забÑ?ани календаÑ? веÑ? Ñ?адÑ?жи догаÑ?аÑ?е за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
+msgstr[2] "Ð?забÑ?ани календаÑ? веÑ? Ñ?адÑ?жи догаÑ?аÑ?а за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? за Ñ?аÑ?Ñ?анак"
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
+msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr[0] "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи задаÑ?ак за даÑ?Ñ? поÑ?Ñ?кÑ?. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нови?"
+msgstr[1] "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи задаÑ?ке за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
+msgstr[2] "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи задаÑ?ака за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:295
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
+msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
+msgstr[0] "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи белеÑ?кÑ? за даÑ?Ñ? поÑ?Ñ?кÑ?. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е новÑ??"
+msgstr[1] "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи белеÑ?ке за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
+msgstr[2] "Ð?забÑ?ани Ñ?пиÑ?ак веÑ? Ñ?адÑ?жи белеÑ?ки за даÑ?е поÑ?Ñ?ке. Ð?елиÑ?е ли ипак да напÑ?авиÑ?е нове?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+#| msgid "No Summary"
+msgid "[No Summary]"
+msgstr "[Ð?ез Ñ?ажеÑ?ка]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "Ð?еиÑ?пÑ?аван обÑ?екаÑ? вÑ?аÑ?ен од Ñ?еÑ?веÑ?а"
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+#| msgid "An error occurred while printing"
+msgid "An error occurred during processing: %s"
+msgstr "Ð?авила Ñ?е гÑ?еÑ?ка Ñ? обÑ?ади: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и календаÑ?. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:300
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
-msgstr ""
-"Ð?забÑ?ани извоÑ? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е, Ñ?Ñ?ога не можеÑ?е Ñ?Ñ? напÑ?авиÑ?и задÑ?жеÑ?е. "
-"Ð?забеÑ?иÑ?е дÑ?Ñ?ги извоÑ?."
+#: ../plugins/mail-to-task/mail-to-task.c:606
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+msgstr "Ð?забÑ?ани извоÑ? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е, Ñ?Ñ?ога не можеÑ?е Ñ?Ñ? напÑ?авиÑ?и догаÑ?аÑ?. Ð?забеÑ?иÑ?е дÑ?Ñ?ги извоÑ?."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr "Ð?забÑ?ани извоÑ? Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е, Ñ?Ñ?ога не можеÑ?е Ñ?Ñ? напÑ?авиÑ?и задаÑ?ак. Ð?забеÑ?иÑ?е дÑ?Ñ?ги извоÑ?."
+
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+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:821
+#, c-format
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot get source list. %s"
+msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?пиÑ?ак извоÑ?а. %s"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr ""
-"Ð?одаÑ?ак коÑ?и омогÑ?Ñ?ава пÑ?авÑ?еÑ?е задÑ?жеÑ?а из Ñ?адÑ?жаÑ?а елекÑ?Ñ?онÑ?ке поÑ?Ñ?ке."
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+msgstr "Ð?Ñ?еÑ?ваÑ?а поÑ?Ñ?кÑ? Ñ? задаÑ?ак."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Ð?Ñ?о_мени Ñ? задÑ?жеÑ?е"
+#| msgid "Create a new memo"
+msgid "Create a Mem_o"
+msgstr "Ð?апÑ?ави белеÑ?к_Ñ?"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "Ð?оÑ?Ñ?а за задÑ?жеÑ?е"
-
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Ð?Ñ?еÑ?воÑ?и изабÑ?анÑ? поÑ?Ñ?кÑ? Ñ? ново задÑ?жеÑ?е"
+#| msgid "New _Meeting"
+msgid "Create a _Meeting"
+msgstr "Ð?апÑ?ави _Ñ?аÑ?Ñ?анак"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#| msgid "Create a new task"
+msgid "Create a _Task"
+msgstr "Ð?апÑ?ави _задаÑ?ак"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#| msgid "_Create new view"
+msgid "Create an _Event"
+msgstr "Ð?апÑ?ави _догаÑ?аÑ?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+#| msgid "Mail to task"
+msgid "Mail-to-Task"
+msgstr "Ð?оÑ?Ñ?а-Ñ?-задаÑ?ак"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "Ð?апÑ?ави нови догаÑ?аÑ? од изабÑ?ане поÑ?Ñ?ке"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting from the selected message"
+msgstr "Ð?апÑ?ави нови Ñ?аÑ?Ñ?анак од изабÑ?ане поÑ?Ñ?ке"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "Ð?апÑ?ави новÑ? белеÑ?кÑ? од изабÑ?ане поÑ?Ñ?ке"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "Ð?апÑ?ави нови задаÑ?ак од изабÑ?ане поÑ?Ñ?ке"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19588,10 +18163,11 @@ msgid "Mailing _List"
 msgstr "Ð?опиÑ?на _лиÑ?Ñ?а"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
-"Ð?безбеÑ?Ñ?Ñ?е Ñ?адÑ?е за опÑ?Ñ?е наÑ?едбе допиÑ?ниÑ? лиÑ?Ñ?и (пÑ?иÑ?ава, одÑ?ава, ...)."
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Ð?зводи Ñ?обиÑ?аÑ?ене Ñ?адÑ?е за допиÑ?нÑ? лиÑ?Ñ?Ñ? (пÑ?иÑ?ава, одÑ?ава, иÑ?д.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19611,14 +18187,11 @@ msgstr "РадÑ?а ниÑ?е доÑ?Ñ?Ñ?пна"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"Ð?лекÑ?Ñ?онÑ?ка поÑ?Ñ?ка Ñ?е биÑ?и поÑ?лаÑ?а на адÑ?еÑ?Ñ? â??{0}â??. Ð?ожеÑ?е поÑ?Ñ?кÑ? да "
-"поÑ?аÑ?еÑ?е аÑ?Ñ?омаÑ?Ñ?ки, или Ñ?е пÑ?во погледаÑ?и и измениÑ?и.\n"
+"Ð?лекÑ?Ñ?онÑ?ка поÑ?Ñ?ка Ñ?е биÑ?и поÑ?лаÑ?а на адÑ?еÑ?Ñ? â??{0}â??. Ð?ожеÑ?е поÑ?Ñ?кÑ? да поÑ?аÑ?еÑ?е аÑ?Ñ?омаÑ?Ñ?ки, или Ñ?е пÑ?во погледаÑ?и и измениÑ?и.\n"
 "\n"
 "ТÑ?ебало би да добиÑ?еÑ?е одговоÑ? Ñ?а допиÑ?не лиÑ?Ñ?е Ñ?бÑ?зо након Ñ?лаÑ?а поÑ?Ñ?ке."
 
@@ -19635,27 +18208,20 @@ msgid "Posting not allowed"
 msgstr "СлаÑ?е ниÑ?е дозвоÑ?ено"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"СлаÑ?е на овÑ? допиÑ?нÑ? лиÑ?Ñ?Ñ? ниÑ?е дозвоÑ?ено. Ð?ожда Ñ?е ова лиÑ?Ñ?а Ñ?амо за "
-"Ñ?иÑ?аÑ?е. Ð?бÑ?аÑ?иÑ?е Ñ?е влаÑ?никÑ? лиÑ?Ñ?е за деÑ?аÑ?е."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "СлаÑ?е на овÑ? допиÑ?нÑ? лиÑ?Ñ?Ñ? ниÑ?е дозвоÑ?ено. Ð?ожда Ñ?е ова лиÑ?Ñ?а Ñ?амо за Ñ?иÑ?аÑ?е. Ð?бÑ?аÑ?иÑ?е Ñ?е влаÑ?никÑ? лиÑ?Ñ?е за деÑ?аÑ?е."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Ð?оÑ?лаÑ?и елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?кÑ? на допиÑ?нÑ? лиÑ?Ñ?Ñ??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-#, fuzzy
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"РадÑ?Ñ? ниÑ?е могÑ?Ñ?е извеÑ?Ñ?и. То знаÑ?и да заглавÑ?е за овÑ? Ñ?адÑ?Ñ? ниÑ?е Ñ?адÑ?жало "
-"обÑ?адивÑ? Ñ?адÑ?Ñ?.\n"
+"РадÑ?Ñ? ниÑ?е могÑ?Ñ?е извеÑ?Ñ?и. Ð?аглавÑ?е за овÑ? Ñ?адÑ?Ñ? ниÑ?е Ñ?адÑ?жало обÑ?адивÑ? Ñ?адÑ?Ñ?.\n"
 "\n"
 "Ð?аглавÑ?е: {0}"
 
@@ -19670,9 +18236,7 @@ msgstr ""
 "Ð?аглавÑ?е: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+msgid "This message does not contain the header information required for this action."
 msgstr "Ð?ва поÑ?Ñ?ка не Ñ?адÑ?жи поÑ?Ñ?ебне подаÑ?ке Ñ? заглавÑ?Ñ? за овÑ? Ñ?адÑ?Ñ?."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -19736,21 +18300,19 @@ msgid "Also mark messages in subfolders?"
 msgstr "Ð?знаÑ?иÑ?и Ñ?акоÑ?е и поÑ?Ñ?ке Ñ? подÑ?аÑ?Ñ?иклама?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:41
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Ð?елиÑ?е ли да ознаÑ?иÑ?е поÑ?Ñ?ке као пÑ?оÑ?иÑ?ане Ñ?амо Ñ? Ñ?Ñ?енÑ?Ñ?ноÑ? Ñ?аÑ?Ñ?икли, или и "
-"оне Ñ? подÑ?аÑ?Ñ?иклама? "
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "Ð?елиÑ?е ли да ознаÑ?иÑ?е поÑ?Ñ?ке као пÑ?оÑ?иÑ?ане Ñ?амо Ñ? Ñ?Ñ?енÑ?Ñ?ноÑ? Ñ?аÑ?Ñ?икли, или и оне Ñ? подÑ?аÑ?Ñ?иклама? "
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "ТÑ?енÑ?Ñ?на Ñ?аÑ?Ñ?икла и _подÑ?аÑ?Ñ?икле"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#| msgid "Current Folder and _Subfolders"
+msgid "In Current Folder and _Subfolders"
+msgstr "У Ñ?Ñ?енÑ?Ñ?ноÑ? Ñ?аÑ?Ñ?икли и _подÑ?аÑ?Ñ?иклама"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "Само Ñ?Ñ?енÑ?Ñ?на _Ñ?аÑ?Ñ?икла"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#| msgid "Current _Folder Only"
+msgid "In Current _Folder Only"
+msgstr "Само Ñ? Ñ?Ñ?енÑ?Ñ?ноÑ? _Ñ?аÑ?Ñ?икли"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19761,20 +18323,22 @@ msgid "Mark Me_ssages as Read"
 msgstr "Ð?знаÑ?и по_Ñ?Ñ?ке као пÑ?оÑ?иÑ?ане"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?е за обележаваÑ?е Ñ?виÑ? поÑ?Ñ?ка Ñ? Ñ?аÑ?Ñ?икли да бÑ?дÑ? пÑ?оÑ?иÑ?ане"
+#| msgid "Mark all messages in the folder as read"
+msgid "Mark all messages in a folder as read."
+msgstr "Ð?знаÑ?ава Ñ?ве поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?икли као пÑ?оÑ?иÑ?ане."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Ð?одаÑ?ак коÑ?и Ñ?води mono додаÑ?ке."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono покÑ?еÑ?аÑ?"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "Ð?одаÑ?и за подÑ?Ñ?кÑ? пиÑ?ани Ñ?езиком Mono."
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Ð?одаÑ?ак за Ñ?кÑ?Ñ?Ñ?иваÑ?е и иÑ?кÑ?Ñ?Ñ?иваÑ?е дÑ?Ñ?гиÑ? додаÑ?ака."
+#| msgid "Change Evolution's settings"
+msgid "Manage your Evolution plugins."
+msgstr "УпÑ?авÑ?а додаÑ?има Ð?волÑ?Ñ?иÑ?е."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19788,7 +18352,7 @@ msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е и иÑ?кÑ?Ñ?Ñ?Ñ?Ñ?е додаÑ?ке"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
-msgstr "Ð?о_даÑ?и"
+msgstr "_Ð?Ñ?икÑ?Ñ?Ñ?Ñ?и"
 
 #: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
@@ -19809,28 +18373,21 @@ msgstr "Ð?Ñ?еглед"
 #: ../plugins/plugin-manager/plugin-manager.c:362
 #: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
-msgstr "Ð?одаÑ?ак"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"Ð?Ñ?обни додаÑ?ак коÑ?и показÑ?Ñ?е како додаÑ?ак за обликоваÑ?е омогÑ?Ñ?ава "
-"иÑ?кÑ?Ñ?Ñ?иваÑ?е HTML поÑ?Ñ?е.\n"
-"\n"
-"Ð?ваÑ? додаÑ?ак Ñ?е Ñ?амо за поÑ?Ñ?ебе демонÑ?Ñ?Ñ?аÑ?иÑ?е.\n"
+msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Ð?одел Ñ?екÑ?Ñ?а"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
-msgstr "Ð?Ñ?едноÑ?Ñ? Ñ?екÑ?Ñ?"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#| msgid "Prefer plain-text"
+msgid "Prefer Plain Text"
+msgstr "Ð?Ñ?едноÑ?Ñ? даÑ?е Ñ?екÑ?Ñ?Ñ?"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "Ð?Ñ?егледа поÑ?Ñ?ке као обиÑ?ан Ñ?екÑ?Ñ?, Ñ?ак и ако Ñ?адÑ?же HTML."
 
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
@@ -19853,67 +18410,94 @@ msgid "Evolution Profiler"
 msgstr "Ð?волÑ?Ñ?иÑ?ин иÑ?пиÑ?иваÑ?"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "УпиÑ?Ñ?Ñ?е дневник иÑ?пиÑ?иваÑ?киÑ? догаÑ?аÑ?а."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "Ð?огаÑ?аÑ?и пÑ?оÑ?ила подаÑ?ака Ñ? Ð?волÑ?Ñ?иÑ?и (Ñ?амо за пÑ?огÑ?амеÑ?е)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-#, fuzzy
 msgid "Import Outlook messages from PST file"
-msgstr "Увози поÑ?Ñ?Ñ? из пÑ?огÑ?ама Pine."
+msgstr "Увози Outlook поÑ?Ñ?ке из даÑ?оÑ?еке PST"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-#, fuzzy
 msgid "Outlook PST import"
-msgstr "Outlook CSV и Tab Ñ?возник"
+msgstr "Outlook PST Ñ?воз"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Outlook personal folders (.pst)"
-msgstr ""
+msgstr "Ð?иÑ?не Ñ?аÑ?Ñ?икле Outlook (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
-msgstr "Ð?меник"
+msgstr "_Ð?дÑ?еÑ?аÑ?"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
-msgstr "Ð?аказани Ñ?аÑ?Ñ?анÑ?и"
+msgstr "Ð?а_казано"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:334
 #| msgid "Journal information"
 msgid "_Journal entries"
-msgstr "Ð?одаÑ?ак о дневникÑ?"
+msgstr "УноÑ?и Ñ? _дневник"
 
-#: ../plugins/pst-import/pst-importer.c:352
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
-msgstr "УвожеÑ?е Elm подаÑ?ака"
+msgstr "УвожеÑ?е Outlook подаÑ?ака"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Ð?озвоÑ?ава обÑ?авÑ?иваÑ?е календаÑ?а на Ð?нÑ?еÑ?неÑ?Ñ?"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Ð?бÑ?авÑ?иваÑ?е календаÑ?а"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Ð?еÑ?Ñ?а"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#| msgid "Allows calendars to be published to the web"
+msgid "Publish calendars to the web."
+msgstr "Ð?бÑ?авÑ?Ñ?Ñ?е календаÑ?е на веб."
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "Ð?бÑ?ави Ñ?аÑ?поÑ?ед из _календаÑ?а"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
-#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open %s:"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+#| msgid "Could not parse PGP message: Unknown error"
+msgid "Could not open %s: Unknown error"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и %s: непознаÑ?а гÑ?еÑ?ка"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Ð?авила Ñ?е гÑ?еÑ?ка пÑ?иликом обÑ?аве на %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "Ð?бÑ?авÑ?иваÑ?е на %s Ñ?Ñ?пеÑ?но завÑ?Ñ?ено"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Ð?еÑ?Ñ?пело монÑ?иÑ?аÑ?е %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
-msgstr "СигÑ?Ñ?но желиÑ?е да Ñ?клониÑ?е овÑ? адÑ?еÑ?Ñ??"
+msgstr "СигÑ?Ñ?но желиÑ?е да Ñ?клониÑ?е овÑ? локаÑ?иÑ?Ñ??"
+
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#| msgid "Could not create message."
+msgid "Could not create publish thread."
+msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?авиÑ?и Ñ?аÑ?пÑ?авÑ?."
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19950,7 +18534,6 @@ msgid "Publishing _Frequency:"
 msgstr "УÑ?еÑ?Ñ?а_лоÑ?Ñ? обÑ?авÑ?иваÑ?а"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-#, fuzzy
 msgid ""
 "Secure FTP (SSH)\n"
 "Public FTP\n"
@@ -19960,39 +18543,54 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"СигÑ?Ñ?ни FTP (SSH)\n"
 "Ð?авни FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
+"FTP (Ñ?а пÑ?иÑ?авом)\n"
+"Windows деÑ?еÑ?е\n"
 "WebDAV (HTTP)\n"
 "СигÑ?Ñ?ни WebDAV (HTTPS)\n"
-"Ð?Ñ?оизвоÑ?но меÑ?Ñ?о"
+"Ð?Ñ?оизвоÑ?на локаÑ?иÑ?а"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "_Ð?Ñ?Ñ?Ñ?а Ñ?Ñ?лÑ?ге:"
+msgstr "_Ð?Ñ?Ñ?Ñ?а Ñ?еÑ?виÑ?а:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#| msgid "Time _zone:"
+msgid "Time _duration:"
+msgstr "Ð?Ñ?еме _Ñ?Ñ?аÑ?аÑ?а:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "Ð?аÑ?о_Ñ?ека:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Ð?озинка:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "Ð?_бÑ?ави као:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Ð?апамÑ?и лозинкÑ?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Ð?оÑ?иÑ?ниÑ?ко име:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"дани\n"
+"недеÑ?е\n"
+"меÑ?еÑ?и"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -20000,13 +18598,19 @@ msgstr ""
 "иÐ?ал\n"
 "Слободно/заÑ?зеÑ?о"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?авиÑ?и календаÑ?: позадинÑ?ки пÑ?оÑ?еÑ? виÑ?е не поÑ?Ñ?оÑ?и"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
-msgstr "Ð?ово меÑ?Ñ?о"
+msgstr "Ð?ова локаÑ?иÑ?а"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
-msgstr "УÑ?еди меÑ?Ñ?о"
+msgstr "УÑ?еди локаÑ?иÑ?Ñ?"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -20025,186 +18629,149 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Ð?окÑ?еÑ?аÑ? Ñ?еÑ?Ñ? пÑ?икÑ?Ñ?Ñ?ка за Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin which loads other plugins written using Python."
-msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак коÑ?и Ñ?Ñ?иÑ?ава дÑ?Ñ?ге пÑ?икÑ?Ñ?Ñ?ке пиÑ?аниÑ? Ñ?езиком python."
+msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак коÑ?и Ñ?Ñ?иÑ?ава дÑ?Ñ?ге пÑ?икÑ?Ñ?Ñ?ке пиÑ?аниÑ? Ñ?езиком Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Ð?окÑ?еÑ?аÑ? Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "Спам Ñ?биÑ?а (Ñ?гÑ?аÑ?ен)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "УбиÑ?а Ñ?пама ниÑ?е пÑ?онаÑ?ен, код: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Ð?иÑ?е Ñ?Ñ?пело пÑ?авÑ?еÑ?е Ñ?еви: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Ð?Ñ?еÑ?ка по издваÑ?аÑ?Ñ?: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "Ð?авиÑ?ан пÑ?оÑ?еÑ? SpamAssassin ниÑ?е одговоÑ?ио, Ñ?биÑ?ам..."
+msgstr "Ð?авиÑ?ан пÑ?оÑ?еÑ? УбиÑ?и Ñ?пама ниÑ?е одговоÑ?ио, Ñ?биÑ?ам..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
-#, fuzzy, c-format
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "ЧекаÑ?е на завиÑ?Ñ?ан пÑ?оÑ?еÑ? Spamassassin омеÑ?ено, пÑ?екидам..."
+msgstr "ЧекаÑ?е на завиÑ?ан пÑ?оÑ?еÑ? УбиÑ?е Ñ?пама омеÑ?ено, пÑ?екидам..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Цев ка Spamassassin Ñ?е пÑ?кла, ознака гÑ?еÑ?ке: %d"
+msgstr "Цев ка УбиÑ?и Ñ?пама Ñ?е пÑ?кла, ознака гÑ?еÑ?ке: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "УбиÑ?а Ñ?пама ниÑ?е доÑ?Ñ?Ñ?пан."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Ð?во Ñ?е Ñ?Ñ?иниÑ?и УбиÑ?Ñ? Ñ?пама поÑ?зданиÑ?им, али Ñ?поÑ?иÑ?им"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "У_кÑ?Ñ?Ñ?и мÑ?ежне пÑ?овеÑ?е"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"ФилÑ?Ñ?иÑ?а нежеÑ?енÑ? поÑ?Ñ?Ñ? коÑ?иÑ?Ñ?еÑ?и УбиÑ?Ñ? Ñ?пама. Ð?ваÑ? додаÑ?ак заÑ?Ñ?ева Ñ?еговÑ? "
-"поновнÑ? инÑ?Ñ?алаÑ?иÑ?Ñ?."
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "ФилÑ?Ñ?иÑ?а нежеÑ?енÑ? поÑ?Ñ?Ñ? коÑ?иÑ?Ñ?еÑ?ем УбиÑ?е Ñ?пама."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
-msgid "SpamAssassin Options"
-msgstr "Ð?пÑ?иÑ?е УбиÑ?а Ñ?пама"
+#| msgid "SpamAssassin junk plugin"
+msgid "SpamAssassin Junk Filter"
+msgstr "ФилÑ?еÑ? нежеÑ?ене поÑ?Ñ?е УбиÑ?а Ñ?пама"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "Ð?одаÑ?ак за нежеÑ?енÑ? поÑ?Ñ?Ñ? УбиÑ?е Ñ?пама"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Ð?одаÑ?ак за Ñ?Ñ?ваÑ?е Ñ?виÑ? пÑ?илога или делова поÑ?Ñ?ке одÑ?едном."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "СаÑ?Ñ?ваÑ? пÑ?илоге"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "СаÑ?Ñ?ваÑ? пÑ?илоге..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "СаÑ?Ñ?ваÑ? Ñ?ве пÑ?илоге"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Ð?забеÑ?и име за Ñ?нимаÑ?е базе"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME Ñ?ип"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "СаÑ?Ñ?ваÑ?"
+msgid "SpamAssassin Options"
+msgstr "Ð?пÑ?иÑ?е УбиÑ?е Ñ?пама"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "Ð?Ð?Ð?"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
-msgstr "Ð?иÑ?Ñ?а опиÑ?а"
+msgstr "СпиÑ?ак опиÑ?а"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
-msgstr "Ð?иÑ?Ñ?а каÑ?егоÑ?иÑ?а"
+msgstr "СпиÑ?ак каÑ?егоÑ?иÑ?а"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
-msgstr "Ð?иÑ?Ñ?а коменÑ?аÑ?а"
-
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Ð?апÑ?авÑ?ено"
+msgstr "СпиÑ?ак коменÑ?аÑ?а"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Ð?онÑ?акÑ? лиÑ?Ñ?а"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Ð?оÑ?еÑ?ак"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Ð?Ñ?аÑ?"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "поÑ?Ñ?оÑ?ак завÑ?Ñ?еног"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "Ð?дÑ?еÑ?а"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "СпиÑ?ак Ñ?Ñ?еÑ?ника"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Ð?змеÑ?ено"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "Ð?апÑ?едне опÑ?иÑ?е за CSV облик"
+#: ../plugins/save-calendar/csv-format.c:523
+#| msgid "Advanced options for the CSV format"
+msgid "A_dvanced options for the CSV format"
+msgstr "Ð?а_пÑ?едне опÑ?иÑ?е за Ñ?оÑ?маÑ? CSV"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "Ð?Ñ?во Ñ?кÑ?Ñ?Ñ?и заглавÑ?е"
+#: ../plugins/save-calendar/csv-format.c:530
+#| msgid "Prepend a header"
+msgid "Prepend a _header"
+msgstr "Ð?Ñ?во Ñ?кÑ?Ñ?Ñ?и _заглавÑ?е"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "Ð?Ñ?аниÑ?ник вÑ?едноÑ?Ñ?и:"
+#: ../plugins/save-calendar/csv-format.c:539
+#| msgid "Value delimiter:"
+msgid "_Value delimiter:"
+msgstr "Ð?Ñ?аниÑ?ник _вÑ?едноÑ?Ñ?и:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "Ð?Ñ?аниÑ?ник запиÑ?а:"
+#: ../plugins/save-calendar/csv-format.c:546
+#| msgid "Record delimiter:"
+msgid "_Record delimiter:"
+msgstr "Ð?Ñ?аниÑ?ник _запиÑ?а:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "Ð?бавиÑ? вÑ?едноÑ?Ñ?и Ñ?а:"
+#: ../plugins/save-calendar/csv-format.c:553
+#| msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
+msgstr "_Ð?бавиÑ? вÑ?едноÑ?Ñ?и Ñ?а:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Ð?аÑ?езом одвоÑ?ен облик вÑ?едноÑ?Ñ?и (.csv)"
 
@@ -20213,8 +18780,9 @@ msgid "Save Selected"
 msgstr "Ð?забÑ?ано Ñ?Ñ?ваÑ?е"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "ЧÑ?ва изабÑ?ани календаÑ? или лиÑ?Ñ?Ñ? задÑ?жеÑ?а на диÑ?к."
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
+msgstr "ЧÑ?ва календаÑ? или Ñ?пиÑ?ак задаÑ?ака на диÑ?к."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -20229,21 +18797,28 @@ msgstr "СаÑ?Ñ?ваÑ? на _диÑ?к"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF облик (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+#| msgid "Format"
+msgid "_Format:"
+msgstr "_ФоÑ?маÑ?:"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Ð?забеÑ?иÑ?е одÑ?едиÑ?нÑ? даÑ?оÑ?екÑ?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Ð?забеÑ?иÑ?е извоÑ?"
+#| msgid "Selects a single calendar or task source for viewing."
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Ð?Ñ?зо биÑ?а Ñ?едан календаÑ? или Ñ?пиÑ?ак задаÑ?ака за пÑ?еглед."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Ð?иÑ?а Ñ?едан извоÑ? календаÑ?а или задÑ?жеÑ?а за пÑ?еглед."
+#| msgid "Select one source"
+msgid "Select One Source"
+msgstr "Ð?забеÑ?иÑ?е Ñ?едан извоÑ?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20251,11 +18826,11 @@ msgstr "_Ð?Ñ?икажи Ñ?амо оваÑ? календаÑ?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "Ð?Ñ?икажи _Ñ?амо оваÑ? Ñ?пиÑ?ак задÑ?жеÑ?а"
+msgstr "Ð?Ñ?икажи _Ñ?амо оваÑ? Ñ?пиÑ?ак задаÑ?ака"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "_Ð?Ñ?икажи Ñ?амо оваÑ? Ñ?пиÑ?ак задÑ?жеÑ?а"
+msgstr "_Ð?Ñ?икажи Ñ?амо оваÑ? Ñ?пиÑ?ак задаÑ?ака"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -20265,56 +18840,54 @@ msgstr "Ð?оди Ð?аÑ? кÑ?оз пÑ?во подеÑ?аваÑ?е налога."
 msgid "Setup Assistant"
 msgstr "Ð?омоÑ?ник подеÑ?аваÑ?а"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
-msgstr "Ð?омоÑ?ник Ð?волÑ?Ñ?иÑ?а подеÑ?аваÑ?а"
+msgstr "Ð?омоÑ?ник подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Ð?обÑ?о доÑ?ли"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"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/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "УвожеÑ?е даÑ?оÑ?ека"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "Ð?забеÑ?иÑ?е подаÑ?ке коÑ?е желиÑ?е да Ñ?везеÑ?е:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Ð?д %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "УвожеÑ?е подаÑ?ака."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "СаÑ?екаÑ?Ñ?е"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Ð?бавеÑ?Ñ?ава ако низаÑ?е поÑ?Ñ?ка Ñ?Ñ?еба да Ñ?е вÑ?аÑ?и на наÑ?лов."
+#| msgid "Thread messages by subject"
+msgid "Sort mail message threads by subject."
+msgstr "РазвÑ?Ñ?Ñ?ава поÑ?Ñ?ке Ñ? Ñ?аÑ?пÑ?ави пÑ?ема наÑ?ловÑ?."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20330,59 +18903,93 @@ msgid "F_all back to threading messages by subject"
 msgstr "Ð?Ñ?а_Ñ?и Ñ?е на низаÑ?е поÑ?Ñ?ка по наÑ?ловÑ?"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-"СпиÑ?ак паÑ?ова кÑ?Ñ?Ñ?на-Ñ?еÑ?/вÑ?едноÑ?Ñ? коÑ?е пÑ?икÑ?Ñ?Ñ?ак Ñ?аблона пÑ?едмеÑ?а замеÑ?Ñ?Ñ?е Ñ? "
-"Ñ?елÑ? поÑ?Ñ?ке."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr "СпиÑ?ак паÑ?ова кÑ?Ñ?Ñ?на-Ñ?еÑ?/вÑ?едноÑ?Ñ? коÑ?е пÑ?икÑ?Ñ?Ñ?ак Шаблона пÑ?едмеÑ?а замеÑ?Ñ?Ñ?е Ñ? Ñ?елÑ? поÑ?Ñ?ке."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Ð?ез зваÑ?а"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "СаÑ?Ñ?ваÑ? као _Ñ?аблон"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "ЧÑ?ва као Ñ?аблон"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за обÑ?азаÑ? за пÑ?ипÑ?еме"
+msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за обÑ?азаÑ? наÑ?Ñ?Ñ?а"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-#, fuzzy
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Ð?едноÑ?Ñ?аван додаÑ?ак коÑ?и коÑ?иÑ?Ñ?и ytnef за декодиÑ?аÑ?е tnef пÑ?илога."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Ð?екодиÑ?а пÑ?илоге TNEF (winmail.dat) из пÑ?огÑ?ама Microsoft Outlook."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "Ð?екодеÑ? TNEF пÑ?илога"
+#| msgid "TNEF Attachment decoder"
+msgid "TNEF Decoder"
+msgstr "Ð?екодеÑ? TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#| msgid "Multiple vCards"
+msgid "Inline vCards"
+msgstr "УгÑ?еждене вÐ?аÑ?Ñ?е"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Ð?Ñ?иказÑ?Ñ?е вÐ?аÑ?Ñ?е непоÑ?Ñ?едно Ñ? поÑ?Ñ?кама."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "Ð?Ñ?икажи пÑ?нÑ? вÐ?аÑ?Ñ?Ñ?"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "Ð?Ñ?икажи Ñ?ажеÑ?Ñ? вÐ?аÑ?Ñ?Ñ?"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is one other contact."
+msgstr "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? Ñ?едан конÑ?акÑ?."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? %d конÑ?акÑ?."
+msgstr[1] "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? %d конÑ?акÑ?а."
+msgstr[2] "Ð?оÑ?Ñ?оÑ?и Ñ?оÑ? %d конÑ?акÑ?а."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#| msgid "Save in address book"
+msgid "Save in Address Book"
+msgstr "СаÑ?Ñ?ваÑ? Ñ? адÑ?еÑ?аÑ?"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за поÑ?Ñ?авÑ?аÑ?е WebDAV конÑ?акаÑ?а."
+#| msgid "WebDAV contacts"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Ð?одаÑ?е WebDAV конÑ?акÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV конÑ?акÑ?и"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "Ð?дÑ?еÑ?а :"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
-#, fuzzy
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Ð?збегаваÑ? IfMatch (поÑ?Ñ?ебно на апаÑ?Ñ? < 2.2.8)"
+msgstr "_Ð?збегаваÑ? IfMatch (поÑ?Ñ?ебно на Ð?паÑ?Ñ? < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -20429,15 +19036,12 @@ msgid "Default window width"
 msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина пÑ?озоÑ?а"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"УкÑ?Ñ?Ñ?Ñ?Ñ?е подеÑ?аваÑ?а поÑ?Ñ?едника када пÑ?иÑ?Ñ?Ñ?па HTTP/безбедан HTTP пÑ?еко "
-"инÑ?еÑ?неÑ?а."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Ð?могÑ?Ñ?Ñ?Ñ?е поÑ?Ñ?авке поÑ?Ñ?едника када пÑ?иÑ?Ñ?Ñ?па HTTP/Ñ?игÑ?Ñ?ан HTTP пÑ?еко Ð?нÑ?еÑ?неÑ?а."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
-msgstr "Ð?омаÑ?ин поÑ?Ñ?едника за HTTP"
+msgstr "Ð?омаÑ?ин поÑ?Ñ?едника за HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
@@ -20456,219 +19060,185 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Ð?Ð? или алиÑ?аÑ? дела коÑ?и Ñ?е подÑ?азÑ?мевано пÑ?иказÑ?Ñ?е по покÑ?еÑ?аÑ?Ñ?."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Ð?ко Ñ?е Ñ?аÑ?но, повезиваÑ?е на поÑ?Ñ?едника заÑ?Ñ?ева аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ?. Ð?оÑ?иÑ?ниÑ?ко "
-"име Ñ?е Ñ?иÑ?а из кÑ?Ñ?Ñ?а GConf â??/apps/evolution/shell/network_config/"
-"authentication_userâ??, а лозинка или из gnome-keyring, или даÑ?оÑ?еке лозинки "
-"~/.gnome2_private/Evolution."
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr "Ð?ко Ñ?е Ñ?аÑ?но, повезиваÑ?е на поÑ?Ñ?едника заÑ?Ñ?ева аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ?. Ð?оÑ?иÑ?ниÑ?ко име Ñ?е Ñ?иÑ?а из кÑ?Ñ?Ñ?а GConf â??/apps/evolution/shell/network_config/authentication_userâ??, а лозинка или из gnome-keyring, или даÑ?оÑ?еке лозинки ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "Last upgraded configuration version"
-msgstr "Ð?оÑ?ледÑ?а надогÑ?аÑ?ена веÑ?зиÑ?а подеÑ?аваÑ?а"
+#| msgid "Insert Attachment"
+msgid "Initial attachment view"
+msgstr "Ð?олазни пÑ?еглед пÑ?илога"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Ð?иÑ?Ñ?а пÑ?Ñ?аÑ?а Ñ?аÑ?Ñ?икли за Ñ?Ñ?клаÑ?иваÑ?е на диÑ?кÑ? за Ñ?ад ван мÑ?еже"
+#| msgid "Install the shared folder"
+msgid "Initial file chooser folder"
+msgstr "Ð?олазна Ñ?аÑ?Ñ?икла избиÑ?аÑ?а даÑ?оÑ?ека"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Ð?олазна Ñ?аÑ?Ñ?икла за пÑ?озоÑ?Ñ?ад GtkFileChooser."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgstr "Ð?олазни пÑ?еглед за алаÑ?ке Ñ?Ñ?аке пÑ?илога. â??0â?? Ñ?е Ð?Ñ?еглед Ñ?а иконама, â??1â?? Ñ?е Ð?Ñ?еглед Ñ? Ñ?пиÑ?ковима."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Last upgraded configuration version"
+msgstr "Ð?оÑ?ледÑ?а надогÑ?аÑ?ена веÑ?зиÑ?а подеÑ?аваÑ?а"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "СпиÑ?ак пÑ?Ñ?аÑ?а Ñ?аÑ?Ñ?икли за Ñ?Ñ?клаÑ?иваÑ?е на диÑ?кÑ? за Ñ?ад ван мÑ?еже"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "Ð?омаÑ?ини без поÑ?Ñ?едника"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Ð?озинка за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? пÑ?иликом коÑ?иÑ?Ñ?еÑ?а поÑ?Ñ?едника за HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "Ð?одел подеÑ?аваÑ?а поÑ?Ñ?едника"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "Ð?омаÑ?ин поÑ?Ñ?едника за SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "Ð?оÑ?Ñ? поÑ?Ñ?едника за SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "Ð?омаÑ?ин поÑ?Ñ?едника за HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
-msgstr "Ð?оÑ?Ñ? безбедног поÑ?Ñ?едника за HTTP"
+msgstr "Ð?оÑ?Ñ? Ñ?игÑ?Ñ?ног поÑ?Ñ?едника за HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Ð?забеÑ?иÑ?е наÑ?ин подеÑ?аваÑ?а поÑ?Ñ?едника. Ð?одÑ?жане Ñ?Ñ? вÑ?едноÑ?Ñ?и 0 (коÑ?иÑ?Ñ?и "
-"Ñ?иÑ?Ñ?емÑ?ке поÑ?Ñ?авке), 1 (без поÑ?Ñ?едника), 2 (коÑ?иÑ?Ñ?и Ñ?Ñ?Ñ?на подеÑ?аваÑ?а "
-"поÑ?Ñ?едника) и 3 (коÑ?иÑ?Ñ?и подеÑ?аваÑ?а поÑ?Ñ?едника на адÑ?еÑ?и)."
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr "Ð?забеÑ?иÑ?е наÑ?ин подеÑ?аваÑ?а поÑ?Ñ?едника. Ð?одÑ?жане Ñ?Ñ? вÑ?едноÑ?Ñ?и 0 â??коÑ?иÑ?Ñ?и Ñ?иÑ?Ñ?емÑ?ке поÑ?Ñ?авкеâ??, 1 â??без поÑ?Ñ?едникаâ??, 2 â??коÑ?иÑ?Ñ?и Ñ?Ñ?Ñ?на подеÑ?аваÑ?а поÑ?Ñ?едникаâ?? и 3 â??коÑ?иÑ?Ñ?и подеÑ?аваÑ?а поÑ?Ñ?едника на адÑ?еÑ?иâ??."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
-msgstr "Ð?оÑ?на облаÑ?Ñ? Ñ?е видÑ?ива"
+msgstr "Ð?оÑ?на Ñ?Ñ?ака Ñ?е видÑ?ива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Ð?Ñ?еÑ?коÑ?и пÑ?озоÑ?Ñ?е Ñ?а Ñ?позоÑ?еÑ?ем о Ñ?азвоÑ?Ñ?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Ð?оÑ?ни Ñ?ад ван мÑ?еже"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
-msgstr "Ð?иниÑ?а Ñ?а Ñ?Ñ?аÑ?ем Ñ?е видÑ?ива"
+msgstr "ТÑ?ака Ñ?Ñ?аÑ?Ñ?Ñ?а Ñ?е видÑ?ива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"Ð?еÑ?зиÑ?а подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е, Ñ?а главним/Ñ?поÑ?едним/нивоом подеÑ?аваÑ?а â?? нпÑ?. "
-"â??2.6.0â??."
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Ð?еÑ?зиÑ?а подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е, Ñ?а главним/Ñ?поÑ?едним/нивоом подеÑ?аваÑ?а (на пÑ?имеÑ? â??2.6.0â??)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "Ð?одÑ?азÑ?мевана виÑ?ина пÑ?озоÑ?а за поÑ?Ñ?кÑ?, Ñ? пикÑ?елима."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина главног пÑ?озоÑ?а, Ñ? пикÑ?елима."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
-msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина помоÑ?не линиÑ?е, Ñ? пикÑ?елима."
+msgstr "Ð?одÑ?азÑ?мевана Ñ?иÑ?ина боÑ?не Ñ?Ñ?аке, Ñ? пикÑ?елима."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"Ð?оÑ?ледÑ?а надогÑ?аÑ?ена веÑ?зиÑ?а подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е, Ñ?а главним/Ñ?поÑ?едним/"
-"нивоом подеÑ?аваÑ?а (нпÑ?. â??2.6.0â??)."
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Ð?оÑ?ледÑ?а надогÑ?аÑ?ена веÑ?зиÑ?а подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е, Ñ?а главним/Ñ?поÑ?едним/нивоом подеÑ?аваÑ?а (на пÑ?имеÑ? â??2.6.0â??)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "Ð?азив маÑ?ине за пÑ?Ñ?Ñ?аÑ?е кÑ?оз HTTP поÑ?Ñ?едника."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Ð?азив маÑ?ине за пÑ?Ñ?Ñ?аÑ?е кÑ?оз безбедног HTTP поÑ?Ñ?едника."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "Ð?азив маÑ?ине за пÑ?Ñ?Ñ?аÑ?е socks поÑ?Ñ?едника."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Ð?оÑ?Ñ? на маÑ?ини одÑ?еÑ?ен Ñ? â??/apps/evolution/shell/network_config/http_hostâ??â?? "
-"коÑ?и поÑ?Ñ?едник пÑ?Ñ?Ñ?а."
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgstr "Ð?оÑ?Ñ? на маÑ?ини одÑ?еÑ?ен Ñ? â??/apps/evolution/shell/network_config/http_hostâ?? коÑ?и поÑ?Ñ?едник пÑ?Ñ?Ñ?а."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"Ð?оÑ?Ñ? на маÑ?ини одÑ?еÑ?ен Ñ? â??/apps/evolution/shell/network_config/secure_hostâ?? "
-"коÑ?и поÑ?Ñ?едник пÑ?Ñ?Ñ?а."
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr "Ð?оÑ?Ñ? на маÑ?ини одÑ?еÑ?ен Ñ? â??/apps/evolution/shell/network_config/secure_hostâ?? коÑ?и поÑ?Ñ?едник пÑ?Ñ?Ñ?а."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"Ð?оÑ?Ñ? на маÑ?ини одÑ?еÑ?ен Ñ? â??/apps/evolution/shell/network_config/socks_hostâ?? "
-"коÑ?и поÑ?Ñ?едник пÑ?Ñ?Ñ?а."
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr "Ð?оÑ?Ñ? на маÑ?ини одÑ?еÑ?ен Ñ? â??/apps/evolution/shell/network_config/socks_hostâ?? коÑ?и поÑ?Ñ?едник пÑ?Ñ?Ñ?а."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"СÑ?ил дÑ?гмади пÑ?озоÑ?а. Ð?оже биÑ?и â??textâ?? (Ñ?екÑ?Ñ?), â??iconsâ?? (икониÑ?е), "
-"â??bothâ?? (обоÑ?е), â??toolbarâ?? (палеÑ?а алаÑ?а). Ð?ко Ñ?е поÑ?Ñ?авÑ?ено â??toolbarâ??, "
-"Ð?номово подеÑ?аваÑ?е палеÑ?е алаÑ?а Ñ?Ñ?вÑ?Ñ?Ñ?Ñ?е Ñ?Ñ?ил дÑ?гмади."
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "СÑ?ил дÑ?гмади пÑ?озоÑ?а. Ð?оже биÑ?и â??textâ?? (Ñ?екÑ?Ñ?), â??iconsâ?? (иконе), â??bothâ?? (обоÑ?е), â??toolbarâ?? (Ñ?Ñ?ака алаÑ?а). Ð?ко Ñ?е поÑ?Ñ?авÑ?ено â??toolbarâ??, Ð?номово подеÑ?аваÑ?е Ñ?Ñ?аке алаÑ?а Ñ?Ñ?вÑ?Ñ?Ñ?Ñ?е Ñ?Ñ?ил."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"Ð?ваÑ? кÑ?Ñ?Ñ? Ñ?адÑ?жи Ñ?пиÑ?ак домаÑ?ина коÑ?и Ñ?Ñ? диÑ?екÑ?но повезани, без коÑ?иÑ?Ñ?еÑ?а "
-"поÑ?Ñ?едника (Ñ?колико Ñ?е акÑ?иван). Ð?Ñ?едноÑ?Ñ?и могÑ? биÑ?и домаÑ?ини, домени "
-"(Ñ?поÑ?Ñ?ебом Ñ?океÑ?а попÑ?Ñ? *.foo.com), IP адÑ?еÑ?е домаÑ?ина (IPv4 и IPv6) и "
-"мÑ?ежне адÑ?еÑ?е Ñ?а маÑ?ком (неÑ?Ñ?о као 192.168.0.0/24)."
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr "Ð?ваÑ? кÑ?Ñ?Ñ? Ñ?адÑ?жи Ñ?пиÑ?ак домаÑ?ина коÑ?и Ñ?Ñ? диÑ?екÑ?но повезани, без коÑ?иÑ?Ñ?еÑ?а поÑ?Ñ?едника (Ñ?колико Ñ?е акÑ?иван). Ð?Ñ?едноÑ?Ñ?и могÑ? биÑ?и домаÑ?ини, домени (Ñ?поÑ?Ñ?ебом Ñ?океÑ?а попÑ?Ñ? *.foo.com), IP адÑ?еÑ?е домаÑ?ина (IPv4 и IPv6) и мÑ?ежне адÑ?еÑ?е Ñ?а маÑ?ком (неÑ?Ñ?о као 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
-msgstr "Ð?алеÑ?а алаÑ?а Ñ?е видÑ?ива"
+msgstr "ТÑ?ака алаÑ?а Ñ?е видÑ?ива"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "Ð?дÑ?еÑ?а Ñ?а вÑ?едноÑ?Ñ?има за подеÑ?аваÑ?е поÑ?Ñ?едника."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "Ð?оÑ?иÑ?Ñ?и поÑ?Ñ?едника за HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Ð?оÑ?иÑ?ниÑ?ко име за аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? када Ñ?е коÑ?иÑ?Ñ?и поÑ?Ñ?едник за HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Ð?а ли Ñ?е Ñ?е Ð?волÑ?Ñ?иÑ?а покÑ?енÑ?Ñ?и Ñ? Ñ?ежимÑ? за Ñ?ад ван мÑ?еже."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Ð?а ли да пÑ?озоÑ? бÑ?де Ñ?веÑ?ан до кÑ?аÑ?а."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
-msgstr "Ð?а ли да боÑ?на повÑ?Ñ? бÑ?де видÑ?ива."
+msgstr "Ð?а ли да боÑ?на Ñ?Ñ?ака бÑ?де видÑ?ива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
-msgstr "Ð?а ли да Ñ?Ñ?аÑ?Ñ?Ñ?на линиÑ?а бÑ?де видÑ?ива."
+msgstr "Ð?а ли да Ñ?Ñ?ака Ñ?Ñ?аÑ?Ñ?Ñ?а бÑ?де видÑ?ива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
-msgstr "Ð?а ли да палеÑ?а алаÑ?а бÑ?де видÑ?ива."
+msgstr "Ð?а ли да Ñ?Ñ?ака алаÑ?а бÑ?де видÑ?ива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Ð?а ли Ñ?е пÑ?озоÑ?Ñ?е Ñ?а Ñ?позоÑ?еÑ?ем Ñ? Ñ?азвоÑ?ним веÑ?зиÑ?ама Ð?волÑ?Ñ?иÑ?е биÑ?и "
-"пÑ?иказано."
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Ð?а ли Ñ?е пÑ?озоÑ?Ñ?е Ñ?а Ñ?позоÑ?еÑ?ем Ñ? Ñ?азвоÑ?ним веÑ?зиÑ?ама Ð?волÑ?Ñ?иÑ?е биÑ?и пÑ?иказано."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Ð?а ли да дÑ?гмад пÑ?озоÑ?а бÑ?дÑ? видÑ?ива."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "СÑ?ил дÑ?гмади пÑ?озоÑ?а"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Ð?Ñ?гмад пÑ?озоÑ?а Ñ?Ñ? видÑ?ива"
 
@@ -20684,23 +19254,19 @@ msgstr "УÑ?поÑ?Ñ?авÑ?ене везе"
 msgid "Click OK to close these connections and go offline"
 msgstr "Ð?ликниÑ?е У Ñ?едÑ? да пÑ?екинеÑ?е везÑ? и Ñ?адиÑ?е ван мÑ?еже"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Ð?забеÑ?иÑ?е Ñ?ип Ñ?возника:"
 
-#: ../shell/e-shell-importer.c:134
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ? коÑ?Ñ? желиÑ?е да Ñ?везеÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ? и изабеÑ?иÑ?е коÑ?ег Ñ?е "
-"Ñ?ипа Ñ?а даÑ?оÑ?ека из лиÑ?Ñ?е."
+#: ../shell/e-shell-importer.c:131
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ? коÑ?Ñ? желиÑ?е да Ñ?везеÑ?е Ñ? Ð?волÑ?Ñ?иÑ?Ñ? и изабеÑ?иÑ?е коÑ?ег Ñ?е Ñ?ипа Ñ?а даÑ?оÑ?ека из лиÑ?Ñ?е."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Ð?забеÑ?иÑ?е одÑ?едиÑ?Ñ?е за оваÑ? Ñ?воз"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20712,58 +19278,64 @@ msgstr ""
 "коÑ?а би Ñ?е могла Ñ?веÑ?Ñ?и. Уколико желиÑ?е да покÑ?Ñ?аÑ?е\n"
 "поново, кликниÑ?е на дÑ?гме â??Ð?азадâ??.\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Ð?ме даÑ?оÑ?еке:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Ð?забеÑ?иÑ?е даÑ?оÑ?екÑ?"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "_Тип даÑ?оÑ?еке:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Увези подаÑ?ке и подеÑ?аваÑ?а из _Ñ?Ñ?аÑ?иÑ?иÑ? пÑ?огÑ?ама"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Увези _Ñ?еднÑ? даÑ?оÑ?екÑ?"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "У_воз"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
-msgstr "Ð?волÑ?Ñ?иÑ?ине поÑ?Ñ?авке"
+msgstr "Ð?одеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Ð?волÑ?Ñ?иÑ?а"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ð?згледа да оваÑ? Ñ?иÑ?Ñ?ем нема инÑ?Ñ?алиÑ?ане Ð?ном пилоÑ? алаÑ?е."
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "Ð?Ñ?еÑ?ка пÑ?и покÑ?еÑ?аÑ?Ñ? %s."
+#| msgid "Error executing %s."
+msgid "Error executing %s. (%s)"
+msgstr "Ð?Ñ?еÑ?ка пÑ?и извÑ?Ñ?аваÑ?Ñ? %s. (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Ð?Ñ?баждаÑ?ин помоÑ?ник ниÑ?е инÑ?Ñ?алиÑ?ан."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "Ð?Ñ?баждаÑ?ин помоÑ?ник не може биÑ?и покÑ?енÑ?Ñ?."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "Ð?гоÑ? Ð?еÑ?Ñ?оÑ?овиÑ? <igor prevod org>\n"
@@ -20771,23 +19343,24 @@ msgstr ""
 "\n"
 "http://prevod.org â?? пÑ?евод на Ñ?Ñ?пÑ?ки Ñ?език."
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Ð?еб Ñ?Ñ?Ñ?аниÑ?а Ð?волÑ?Ñ?иÑ?е"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "_Рад на мÑ?ежи"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ра_д ван мÑ?еже"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Рад ван мÑ?еже"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20795,11 +19368,11 @@ msgstr ""
 "Ð?волÑ?Ñ?иÑ?а Ñ?е Ñ?Ñ?енÑ?Ñ?но на мÑ?ежи.\n"
 "Ð?ликниÑ?е на ово дÑ?гме за Ñ?ад ван мÑ?еже."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?е Ñ? пÑ?оÑ?еÑ?Ñ? иÑ?кÑ?Ñ?Ñ?иваÑ?а Ñ?а мÑ?еже."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20807,54 +19380,56 @@ msgstr ""
 "Ð?волÑ?Ñ?иÑ?а Ñ?Ñ?енÑ?Ñ?но ниÑ?е на мÑ?ежи.\n"
 "Ð?ликниÑ?е на ово дÑ?гме да Ñ?е повежеÑ?е."
 
-#: ../shell/e-shell-window.c:785
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Ð?Ñ?еÑ?и на %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Ð?епознаÑ?а Ñ?иÑ?Ñ?емÑ?ка гÑ?еÑ?ка."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832
+#: ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251
+#: ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "У Ñ?едÑ?"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Ð?еиÑ?пÑ?авни аÑ?гÑ?менÑ?и"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "Ð?иÑ?е могÑ?Ñ?а Ñ?егиÑ?Ñ?Ñ?аÑ?иÑ?а на OAF"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "Ð?аза Ñ?а подеÑ?аваÑ?има ниÑ?е наÑ?ена"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Ð?ово"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Ð?ова пÑ?оба"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "_Ð?Ñ?оба"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
-msgstr "Ð?апÑ?ави нови пÑ?обни пÑ?едмеÑ?"
+msgstr "Ð?апÑ?ави новÑ? пÑ?обнÑ? Ñ?Ñ?авкÑ?"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -20870,16 +19445,15 @@ msgstr "Увези даÑ?оÑ?екÑ?"
 
 #: ../shell/import.glade.h:4
 msgid "Import Location"
-msgstr "Увези меÑ?Ñ?о"
+msgstr "Увези локаÑ?иÑ?Ñ?"
 
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "Тип Ñ?возника"
 
 #: ../shell/import.glade.h:6
-#, fuzzy
 msgid "Select Information to Import"
-msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ? за Ñ?воз"
+msgstr "Ð?забеÑ?иÑ?е инÑ?оÑ?маÑ?иÑ?Ñ? за Ñ?воз"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20896,7 +19470,7 @@ msgstr ""
 "Ñ?воза Ñ?поÑ?ниÑ? даÑ?оÑ?ека Ñ? Ð?волÑ?Ñ?иÑ?Ñ?."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20916,7 +19490,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Ð?дÑ?аво. Хвала Ñ?Ñ?о Ñ?Ñ?е Ñ?ложили вÑ?еме да пÑ?еÑ?змеÑ?е ово Ñ?азвоÑ?но издаÑ?е\n"
-"Ð?волÑ?Ñ?иÑ?а пакеÑ?а пÑ?огÑ?ама.\n"
+"пакеÑ?а пÑ?огÑ?ама Ð?волÑ?Ñ?иÑ?а.\n"
 "\n"
 "Ð?ва веÑ?зиÑ?а Ð?волÑ?Ñ?иÑ?е Ñ?оÑ? ниÑ?е поÑ?пÑ?на. Све Ñ?е ближа,\n"
 "али неке могÑ?Ñ?ноÑ?Ñ?и или ниÑ?Ñ? завÑ?Ñ?ене или не Ñ?аде иÑ?пÑ?авно.\n"
@@ -20925,13 +19499,13 @@ msgstr ""
 "и инÑ?Ñ?алиÑ?аÑ?Ñ?е веÑ?зиÑ?Ñ? %s.\n"
 "\n"
 "Уколико пÑ?онаÑ?еÑ?е гÑ?еÑ?ке, пÑ?иÑ?авиÑ?е нам иÑ? на bugzilla.gnome.org.\n"
-"Ð?ваÑ? пÑ?оизвод долази без Ñ?амÑ?Ñ?ва и ниÑ?е намеÑ?ен поÑ?единÑ?има коÑ?и\n"
+"Ð?ваÑ? пÑ?оизвод долази без Ñ?емÑ?Ñ?ва и ниÑ?е намеÑ?ен поÑ?единÑ?има коÑ?и\n"
 "Ñ?Ñ? Ñ?клони наÑ?илном понаÑ?аÑ?Ñ? или беÑ?Ñ?.\n"
 "\n"
 "Ð?адамо Ñ?е да Ñ?еÑ?е Ñ?живаÑ?и Ñ? плодовима наÑ?ег напоÑ?ног Ñ?ада, и \n"
 "жеÑ?но иÑ?Ñ?екÑ?Ñ?емо Ð?аÑ? допÑ?иноÑ?!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20939,43 +19513,43 @@ msgstr ""
 "Хвала\n"
 "Тим Ð?волÑ?Ñ?иÑ?е\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Ð?емоÑ? ми поново Ñ?еÑ?и"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Ð?окÑ?ени Ð?волÑ?Ñ?иÑ?Ñ? Ñ?з наведени део"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "Ð?оÑ?ни Ñ?ад на мÑ?ежи"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Силом гаÑ?и Ñ?ве делове Ð?волÑ?Ñ?иÑ?е"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Ð?Ñ?имоÑ?аÑ? понован пÑ?еноÑ? подаÑ?ака из Ð?волÑ?Ñ?иÑ?е 1.4"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Ð?оÑ?аÑ?и излаз о гÑ?еÑ?кама из Ñ?виÑ? делова Ñ? даÑ?оÑ?екÑ?."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?Ñ?иÑ?аваÑ?е Ñ?виÑ? додаÑ?ака."
+msgstr "Ð?немогÑ?Ñ?ава Ñ?Ñ?иÑ?аваÑ?е Ñ?виÑ? додаÑ?ака."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?Ñ?е окно за пÑ?еглед поÑ?Ñ?е, конÑ?акаÑ?а и задÑ?жеÑ?а."
+msgstr "Ð?немогÑ?Ñ?ава окно за пÑ?еглед поÑ?Ñ?е, конÑ?акаÑ?а и задаÑ?ака."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
-msgstr "Ð?волÑ?Ñ?иÑ?а - Ð?иÑ?ни Ñ?Ñ?едник подаÑ?ака и пÑ?огÑ?ам за е-поÑ?Ñ?Ñ?"
+msgstr "- Ð?волÑ?Ñ?иÑ?а Ñ?Ñ?ководилаÑ? лиÑ?ним подаÑ?аÑ?има и клиÑ?енÑ? е-поÑ?Ñ?е"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20990,9 +19564,8 @@ msgstr "СигÑ?Ñ?но желиÑ?е да Ñ?ве запамÑ?ене лозинк
 
 # shell:noshell-reason title
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
 msgid "Cannot start Evolution"
-msgstr "Ð?оново покÑ?еÑ?е Ð?волÑ?Ñ?иÑ?Ñ?"
+msgstr "Ð?иÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и Ð?волÑ?Ñ?иÑ?Ñ?"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Continue"
@@ -21009,16 +19582,12 @@ msgid "Evolution can not start."
 msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?е не може покÑ?енÑ?Ñ?и."
 
 #: ../shell/shell.error.xml.h:6
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Ð?абоÑ?авÑ?аÑ?е лозинки Ñ?е оÑ?иÑ?Ñ?иÑ?и Ñ?ве запамÑ?ене лозинке. Ð?оново Ñ?еÑ?е биÑ?и "
-"Ñ?пиÑ?ани када Ñ?ледеÑ?и пÑ?Ñ? бÑ?дÑ? биле поÑ?Ñ?ебне."
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "Ð?абоÑ?авÑ?аÑ?е лозинки Ñ?е оÑ?иÑ?Ñ?иÑ?и Ñ?ве запамÑ?ене лозинке. Ð?оново Ñ?еÑ?е биÑ?и Ñ?пиÑ?ани када Ñ?ледеÑ?и пÑ?Ñ? бÑ?дÑ? биле поÑ?Ñ?ебне."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
-msgstr "Ð?едовоÑ?но меÑ?Ñ?а на диÑ?кÑ? за догÑ?аÑ?иваÑ?е."
+msgstr "Ð?едовоÑ?но меÑ?Ñ?а на диÑ?кÑ? за надогÑ?адÑ?Ñ?."
 
 # shell:upgrade-remove-1-4-confirm primary
 #: ../shell/shell.error.xml.h:9
@@ -21027,40 +19596,27 @@ msgstr "Ð?аиÑ?Ñ?а обÑ?иÑ?аÑ?и Ñ?Ñ?аÑ?е подаÑ?ке?"
 
 #: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
 "Цео Ñ?адÑ?жаÑ? Ñ?аÑ?Ñ?икле &quot;evolution&quot; Ñ?е биÑ?и Ñ?Ñ?аÑ?но обÑ?иÑ?ан.\n"
 "\n"
-"СавеÑ?Ñ?Ñ?емо да пÑ?овеÑ?иÑ?е да ли поÑ?Ñ?оÑ?е поÑ?Ñ?а, конÑ?акÑ?и и календаÑ?, и да ли "
-"ова веÑ?зиÑ?а Ð?волÑ?Ñ?иÑ?е иÑ?пÑ?авно Ñ?ади пÑ?е бÑ?иÑ?аÑ?а Ñ?Ñ?аÑ?иÑ? подаÑ?ака.\n"
+"СавеÑ?Ñ?Ñ?емо да пÑ?овеÑ?иÑ?е да ли поÑ?Ñ?оÑ?е поÑ?Ñ?а, конÑ?акÑ?и и календаÑ?, и да ли ова веÑ?зиÑ?а Ð?волÑ?Ñ?иÑ?е иÑ?пÑ?авно Ñ?ади пÑ?е бÑ?иÑ?аÑ?а Ñ?Ñ?аÑ?иÑ? подаÑ?ака.\n"
 "\n"
-"Ð?оÑ?ле бÑ?иÑ?аÑ?а, не можеÑ?е да Ñ?е вÑ?аÑ?иÑ?е на пÑ?еÑ?Ñ?однÑ? веÑ?зиÑ?Ñ? Ð?волÑ?Ñ?иÑ?е без "
-"Ñ?Ñ?Ñ?не инÑ?еÑ?венÑ?иÑ?е.\n"
+"Ð?оÑ?ле бÑ?иÑ?аÑ?а, не можеÑ?е да Ñ?е вÑ?аÑ?иÑ?е на пÑ?еÑ?Ñ?однÑ? веÑ?зиÑ?Ñ? Ð?волÑ?Ñ?иÑ?е без Ñ?Ñ?Ñ?не инÑ?еÑ?венÑ?иÑ?е.\n"
 
 #: ../shell/shell.error.xml.h:16
-#, fuzzy
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
 msgstr ""
-"Ð?Ñ?еÑ?Ñ?одна веÑ?зиÑ?а еволÑ?Ñ?иÑ?е Ñ?е Ñ?меÑ?Ñ?ала Ñ?воÑ?е подаÑ?ке на дÑ?Ñ?го меÑ?Ñ?о.\n"
+"Ð?Ñ?еÑ?Ñ?одна веÑ?зиÑ?а Ð?волÑ?Ñ?иÑ?е Ñ?меÑ?Ñ?ала Ñ?е подаÑ?ке на дÑ?Ñ?гÑ? локаÑ?иÑ?Ñ?.\n"
 "\n"
-"Уколико одлÑ?Ñ?иÑ?е да Ñ?клониÑ?е ове подаÑ?ке, Ñ?ео Ñ?адÑ?жаÑ? Ñ?аÑ?Ñ?икле &quot;"
-"evolution&quot; биÑ?е Ñ?Ñ?аÑ?но обÑ?иÑ?ан. Уколико Ñ?е одлÑ?Ñ?иÑ?е да задÑ?жиÑ?е ове "
-"подаÑ?ке, моÑ?аÑ?еÑ?е Ñ?Ñ?Ñ?но да Ñ?клониÑ?е Ñ?адÑ?жаÑ? из &quot;evolution&quot;када Ð?ам "
-"одговаÑ?а.\n"
+"Уколико одлÑ?Ñ?иÑ?е да Ñ?клониÑ?е ове подаÑ?ке, Ñ?ео Ñ?адÑ?жаÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ма &quot;evolution&quot; биÑ?е Ñ?Ñ?аÑ?но Ñ?клоÑ?ен. Уколико Ñ?е одлÑ?Ñ?иÑ?е да задÑ?жиÑ?е ове подаÑ?ке, моÑ?аÑ?еÑ?е Ñ?Ñ?Ñ?но да Ñ?клониÑ?е Ñ?адÑ?жаÑ? из &quot;evolution&quot; када Ð?ам одговаÑ?а.\n"
 
 #: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
@@ -21068,14 +19624,11 @@ msgstr "Ð?еÑ?Ñ?пела надогÑ?адÑ?а Ñ?а пÑ?еÑ?Ñ?одне веÑ?зи
 
 #: ../shell/shell.error.xml.h:21
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Ð?адогÑ?адÑ?а подаÑ?ака и подеÑ?аваÑ?а Ñ?е заÑ?Ñ?еваÑ?и до {0} пÑ?оÑ?Ñ?оÑ?а на диÑ?кÑ?, али "
-"имаÑ?е на Ñ?аÑ?полагаÑ?Ñ? Ñ?амо {1}.\n"
+"Ð?адогÑ?адÑ?а подаÑ?ака и поÑ?Ñ?авки Ñ?е заÑ?Ñ?еваÑ?и до {0} пÑ?оÑ?Ñ?оÑ?а на диÑ?кÑ?, али имаÑ?е на Ñ?аÑ?полагаÑ?Ñ? Ñ?амо {1}.\n"
 "\n"
 "Ð?оÑ?аÑ?еÑ?е да оÑ?лободиÑ?е виÑ?е меÑ?Ñ?а Ñ? лиÑ?ноÑ? Ñ?аÑ?Ñ?икли пÑ?е него Ñ?Ñ?о наÑ?Ñ?авиÑ?е."
 
@@ -21119,13 +19672,11 @@ msgstr "_Ð?одÑ?еÑ?и ме каÑ?ниÑ?е"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"Уколико одлÑ?Ñ?иÑ?е да наÑ?Ñ?авиÑ?е, можда неÑ?еÑ?е моÑ?и да пÑ?иÑ?Ñ?Ñ?пиÑ?е неким Ñ?Ñ?аÑ?им "
-"подаÑ?има.\n"
+"Уколико одлÑ?Ñ?иÑ?е да наÑ?Ñ?авиÑ?е, можда неÑ?еÑ?е моÑ?и да пÑ?иÑ?Ñ?Ñ?пиÑ?е неким Ñ?Ñ?аÑ?им подаÑ?има.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -21134,27 +19685,17 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"СеÑ?иÑ?икаÑ? â??%sâ?? Ñ?е CA Ñ?еÑ?Ñ?иÑ?икаÑ?.\n"
+"СеÑ?Ñ?иÑ?икаÑ? â??%sâ?? Ñ?е CA Ñ?еÑ?Ñ?иÑ?икаÑ?.\n"
 "\n"
-"УÑ?едиÑ?е подеÑ?аваÑ?а повеÑ?еÑ?а:"
+"УÑ?едиÑ?е поÑ?Ñ?авке повеÑ?еÑ?а:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Ð?оÑ?Ñ?о веÑ?Ñ?Ñ?еÑ?е издаваоÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а, онда веÑ?Ñ?Ñ?еÑ?е и Ñ? аÑ?Ñ?енÑ?иÑ?ноÑ?Ñ? "
-"овог Ñ?еÑ?Ñ?иÑ?икаÑ?а оÑ?им ако овде не назнаÑ?иÑ?е дÑ?Ñ?гаÑ?иÑ?е"
+#: ../smime/gui/cert-trust-dialog.c:150
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Ð?оÑ?Ñ?о веÑ?Ñ?Ñ?еÑ?е издаваоÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а, онда веÑ?Ñ?Ñ?еÑ?е и Ñ? аÑ?Ñ?енÑ?иÑ?ноÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а оÑ?им ако овде не назнаÑ?иÑ?е дÑ?Ñ?гаÑ?иÑ?е"
 
-#: ../smime/gui/cert-trust-dialog.c:155
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Ð?оÑ?Ñ?о не веÑ?Ñ?Ñ?еÑ?е издаваоÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а, онда не веÑ?Ñ?Ñ?еÑ?е ни Ñ? "
-"аÑ?Ñ?енÑ?иÑ?ноÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а оÑ?им ако овде не назнаÑ?иÑ?е дÑ?Ñ?гаÑ?иÑ?е"
+#: ../smime/gui/cert-trust-dialog.c:154
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Ð?оÑ?Ñ?о не веÑ?Ñ?Ñ?еÑ?е издаваоÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а, онда не веÑ?Ñ?Ñ?еÑ?е ни Ñ? аÑ?Ñ?енÑ?иÑ?ноÑ?Ñ? овог Ñ?еÑ?Ñ?иÑ?икаÑ?а оÑ?им ако овде не назнаÑ?иÑ?е дÑ?Ñ?гаÑ?иÑ?е"
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:383
@@ -21183,8 +19724,9 @@ msgstr "Ð?ме Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 msgid "Purposes"
 msgstr "Ð?амене"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "СеÑ?иÑ?Ñ?ки бÑ?оÑ?"
 
@@ -21212,7 +19754,7 @@ msgstr "Ð?Ñ?егледаÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s"
 #: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
-msgstr "УнеÑ?иÑ?е лозинкÑ? за â??%sâ??"
+msgstr "УнеÑ?иÑ?е лозинкÑ? за â??%sâ??"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -21295,14 +19837,11 @@ msgid "Backup All"
 msgstr "РезеÑ?ва Ñ?вега"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Ð?Ñ?е веÑ?оваÑ?а овом издаваоÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?а, пÑ?во пÑ?егледаÑ?Ñ?е Ñ?егов Ñ?еÑ?Ñ?иÑ?икаÑ?, "
-"полиÑ?икÑ? и пÑ?оÑ?едÑ?Ñ?е (ако Ñ?Ñ? доÑ?Ñ?Ñ?пни)."
+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.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "СеÑ?Ñ?иÑ?икаÑ?"
 
@@ -21378,11 +19917,13 @@ msgstr "Ð?Ñ?ганизаÑ?иона Ñ?единиÑ?а (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 оÑ?иÑ?ак"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35
+#: ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? SSL клиÑ?енÑ?а"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? SSL Ñ?еÑ?веÑ?а"
 
@@ -21411,8 +19952,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Ð?маÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?е овиÑ? оÑ?ганизаÑ?иÑ?а коÑ?и ваÑ? одÑ?еÑ?Ñ?Ñ?Ñ?:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "Ð?Ñ?жиÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?е коÑ?и одÑ?еÑ?Ñ?Ñ?Ñ? ове издаваоÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?а:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -21428,170 +19968,175 @@ msgid "_Edit CA Trust"
 msgstr "_УÑ?еди повеÑ?еÑ?е Ñ? CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? веÑ? поÑ?Ñ?оÑ?и"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:222
+#: ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Ð?оÑ?пиÑ?и"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "ШиÑ?Ñ?Ñ?Ñ?"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Ð?еÑ?зиÑ?а"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Ð?еÑ?зиÑ?а 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Ð?еÑ?зиÑ?а 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Ð?еÑ?зиÑ?а 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 Ñ?а RSA Ñ?иÑ?Ñ?оваÑ?ем"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 Ñ?а RSA Ñ?иÑ?Ñ?оваÑ?ем"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 Ñ?а RSA Ñ?иÑ?Ñ?оваÑ?ем"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Ñ?иÑ?Ñ?оваÑ?е"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "УпоÑ?Ñ?еба кÑ?Ñ?Ñ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape Ñ?ип Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Ð?дÑ?еÑ?иваÑ? кÑ?Ñ?Ñ?а издаваоÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Ð?дÑ?еÑ?иваÑ? пÑ?едмеÑ?а (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Ð?дÑ?еÑ?иваÑ? алгоÑ?иÑ?ма"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?и алгоÑ?иÑ?ма"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Ð?одаÑ?и о Ñ?авном кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?бÑ?екÑ?а"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Ð?лгоÑ?иÑ?ам Ñ?авног кÑ?Ñ?Ñ?а Ñ?Ñ?бÑ?екÑ?а"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Ð?авни кÑ?Ñ?Ñ? Ñ?Ñ?бÑ?екÑ?а"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791
+#: ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Ð?Ñ?еÑ?ка: ниÑ?е могÑ?Ñ?а обÑ?ада пÑ?оÑ?иÑ?еÑ?а"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812
+#: ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Ð?оÑ?пиÑ?ник пÑ?едмеÑ?а"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL издаваÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "Ð?здаваÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а е-поÑ?Ñ?е"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Ð?оÑ?пиÑ?иваÑ?е"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Ð?ез одÑ?иÑ?аÑ?а"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Ð?амÑ?Ñ?иваÑ?е кÑ?Ñ?Ñ?а"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Ð?амÑ?Ñ?иваÑ?е подаÑ?ака"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "СаглаÑ?ноÑ?Ñ? кÑ?Ñ?Ñ?а"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Ð?оÑ?пиÑ?ник Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL поÑ?пиÑ?ник"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Ð?Ñ?иÑ?иÑ?но"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Ð?иÑ?е кÑ?иÑ?иÑ?но"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Ð?Ñ?оÑ?иÑ?еÑ?а"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072
+#: ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Ð?лгоÑ?иÑ?ам поÑ?пиÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Ð?здавалаÑ?"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Ð?единÑ?Ñ?вени Ð?Ð? издаваÑ?а"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Ð?единÑ?Ñ?вени Ð?Ð? Ñ?Ñ?бÑ?екÑ?а"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Ð?Ñ?едноÑ?Ñ? поÑ?пиÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
@@ -21623,7 +20168,7 @@ msgstr "Ð?аÑ?еÑ?е %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
-msgstr "Ð?одеÑ?аваÑ?а имени_ка"
+msgstr "Ð?одеÑ?аваÑ?а адÑ?еÑ?а_Ñ?а"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
@@ -21635,23 +20180,24 @@ msgstr "Умножи _Ñ?ве конÑ?акÑ?е Ñ?..."
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
-msgstr "Ð?Ñ?ед-пÑ?еглед ко_нÑ?акÑ?а"
+msgstr "Ð?Ñ?е_глед конÑ?акÑ?а"
 
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Умножи"
 
 #: ../ui/evolution-addressbook.xml.h:7
-#, fuzzy
 msgid "Copy selected contacts to another folder"
-msgstr "Умножи изабÑ?ане конÑ?акÑ?е Ñ? дÑ?Ñ?гÑ? Ñ?аÑ?Ñ?иклÑ?..."
+msgstr "Умножи изабÑ?ане конÑ?акÑ?е Ñ? дÑ?Ñ?гÑ? Ñ?аÑ?Ñ?иклÑ?"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Умножи конÑ?акÑ?е изабÑ?ане Ñ?аÑ?Ñ?икле Ñ? некÑ? дÑ?Ñ?гÑ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Умножи изабÑ?ано"
 
@@ -21663,18 +20209,20 @@ msgstr "Умножи Ñ? Ñ?аÑ?Ñ?иклÑ?..."
 msgid "Create a new address book folder"
 msgstr "Ð?Ñ?ави новÑ? Ñ?аÑ?Ñ?иклÑ? адÑ?еÑ?аÑ?а"
 
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ð?Ñ?еÑ?и"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Ð?Ñ?еÑ?и изабÑ?ано"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "У_клони именик"
+msgstr "Ð?_бÑ?иÑ?и адÑ?еÑ?аÑ?"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
@@ -21693,9 +20241,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Ð?Ñ?емеÑ?Ñ?и _Ñ?ве конÑ?акÑ?е Ñ?..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-#, fuzzy
 msgid "Move selected contacts to another folder"
-msgstr "Ð?Ñ?емеÑ?Ñ?и изабÑ?ане конÑ?акÑ?е Ñ? дÑ?Ñ?гÑ? Ñ?аÑ?Ñ?иклÑ?..."
+msgstr "Ð?Ñ?емеÑ?Ñ?и изабÑ?ане конÑ?акÑ?е Ñ? дÑ?Ñ?гÑ? Ñ?аÑ?Ñ?иклÑ?"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -21705,18 +20252,20 @@ msgstr "Ð?Ñ?емеÑ?Ñ?и конÑ?акÑ?е изабÑ?ане Ñ?аÑ?Ñ?икле Ñ? 
 msgid "Move to Folder..."
 msgstr "Ð?Ñ?емеÑ?Ñ?и Ñ? Ñ?аÑ?Ñ?иклÑ?..."
 
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "УбаÑ?и"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "УбаÑ?и из Ñ?пиÑ?ка иÑ?еÑ?ака"
 
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
-msgstr "Ð?Ñ?егледа конÑ?акÑ?е за Ñ?Ñ?ампÑ?"
+msgstr "Ð?Ñ?егледа конÑ?акÑ?е пÑ?ед Ñ?Ñ?ампÑ?"
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
@@ -21728,22 +20277,22 @@ msgstr "Ð?Ñ?еименÑ?Ñ? изабÑ?анÑ? Ñ?аÑ?Ñ?иклÑ?"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "_СаÑ?Ñ?ваÑ? именик као Ð?Ð?аÑ?Ñ?Ñ?"
+msgstr "_СаÑ?Ñ?ваÑ? адÑ?еÑ?аÑ? као Ð?Ð?аÑ?Ñ?Ñ?"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "СаÑ?Ñ?ваÑ? као Ð?Ð?аÑ?Ñ?Ñ?..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-#, fuzzy
 msgid "Save selected contacts as a VCard"
-msgstr "ЧÑ?ва изабÑ?ане конÑ?акÑ?е као Ð?Ð?аÑ?Ñ?Ñ?."
+msgstr "СаÑ?Ñ?ваÑ? изабÑ?ане конÑ?акÑ?е као Ð?Ð?аÑ?Ñ?Ñ?"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ЧÑ?ва конÑ?акÑ?е изабÑ?ане Ñ?аÑ?Ñ?икле као Ð?Ð?аÑ?Ñ?Ñ?."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Ð?забеÑ?и Ñ?ве"
 
@@ -21756,18 +20305,16 @@ msgid "Select all contacts"
 msgstr "Ð?забеÑ?и Ñ?ве конÑ?акÑ?е"
 
 #: ../ui/evolution-addressbook.xml.h:37
-#, fuzzy
 msgid "Send a message to the selected contacts"
-msgstr "ШаÑ?е поÑ?Ñ?кÑ? изабÑ?аним конÑ?акÑ?има."
+msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? изабÑ?аним конÑ?акÑ?има"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "ШаÑ?е поÑ?Ñ?кÑ? конÑ?акÑ?Ñ?"
 
 #: ../ui/evolution-addressbook.xml.h:39
-#, fuzzy
 msgid "Send selected contacts to another person"
-msgstr "ШаÑ?е изабÑ?ане конÑ?акÑ?е дÑ?Ñ?гоÑ? оÑ?оби."
+msgstr "Ð?оÑ?аÑ?и изабÑ?ане конÑ?акÑ?е дÑ?Ñ?гоÑ? оÑ?оби"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -21789,7 +20336,8 @@ msgstr "Ð?Ñ?екини Ñ?Ñ?иÑ?аваÑ?е"
 msgid "View the current contact"
 msgstr "Ð?Ñ?егледаÑ? Ñ?екÑ?Ñ?и конÑ?акÑ?"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_РадÑ?е"
@@ -21818,7 +20366,8 @@ msgstr "Ð?Ñ?емеÑ?_Ñ?и конÑ?акÑ? Ñ?..."
 msgid "_Move Folder Contacts To"
 msgstr "_Ð?Ñ?емеÑ?Ñ?и конÑ?акÑ?е из Ñ?аÑ?Ñ?икле Ñ?"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Ð?ово"
 
@@ -21852,7 +20401,7 @@ msgstr "Ð?бÑ?иÑ?и Ñ?ве поÑ?аве"
 
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
-msgstr "Ð?бÑ?иÑ?и заказани Ñ?аÑ?Ñ?анак"
+msgstr "Ð?бÑ?иÑ?и заказиваÑ?е"
 
 #: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
@@ -21878,17 +20427,19 @@ msgstr "СпиÑ?ак"
 msgid "Month"
 msgstr "Ð?еÑ?еÑ?"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "СледеÑ?е"
 
 #: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
-msgstr "Ð?Ñ?егледа календаÑ? за Ñ?Ñ?ампÑ?"
+msgstr "Ð?Ñ?егледа календаÑ? пÑ?ед Ñ?Ñ?ампÑ?"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Ð?Ñ?еÑ?Ñ?одно"
 
@@ -21896,13 +20447,14 @@ msgstr "Ð?Ñ?еÑ?Ñ?одно"
 msgid "Print this calendar"
 msgstr "ШÑ?ампа оваÑ? календаÑ?"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Ð?зба_Ñ?и"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr "Ð?збаÑ?и Ñ?Ñ?аÑ?е Ñ?аÑ?Ñ?анке"
+msgstr "Ð?збаÑ?и Ñ?Ñ?аÑ?а заказиваÑ?а и Ñ?аÑ?Ñ?анке"
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
@@ -21942,9 +20494,10 @@ msgstr "Ð?Ñ?икажи Ñ?аднÑ? недеÑ?Ñ?"
 
 #: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
-msgstr "Ð?Ñ?егледаÑ? Ñ?екÑ?Ñ?и Ñ?аÑ?Ñ?анак"
+msgstr "Ð?Ñ?егледа Ñ?екÑ?Ñ?е заказиваÑ?е"
 
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
 msgstr "Ð?Ñ?егледа поÑ?Ñ?ке Ñ? конзоли за диÑ?агнозÑ? кваÑ?а"
 
@@ -21956,7 +20509,8 @@ msgstr "Ð?едеÑ?а"
 msgid "Work Week"
 msgstr "Радна недеÑ?а"
 
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
 msgstr "Ð?невниÑ?и _диÑ?агнозе кваÑ?а"
 
@@ -21992,7 +20546,8 @@ msgstr "Ð?Ñ?еÑ?зима поÑ?Ñ?ке за налоге/Ñ?аÑ?Ñ?икле коÑ?
 msgid "Empty _Trash"
 msgstr "Ð?збаÑ?и _Ñ?меÑ?е"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "ФаÑ?_Ñ?икла"
 
@@ -22061,9 +20616,8 @@ msgstr "_Ð?Ñ?еглед"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-#, fuzzy
 msgid "_Subscriptions..."
-msgstr "_Ð?Ñ?иÑ?аве"
+msgstr "_Ð?Ñ?иÑ?аве..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
@@ -22119,8 +20673,7 @@ msgid "Hide _Read Messages"
 msgstr "СакÑ?иÑ? пÑ?о_Ñ?иÑ?ане поÑ?Ñ?ке"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "СакÑ?иÑ? обÑ?иÑ?ане поÑ?Ñ?ке Ñ?меÑ?Ñ?о Ñ?иÑ?овог пÑ?еÑ?Ñ?Ñ?аваÑ?а"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -22200,14 +20753,15 @@ msgstr "Ð?оÑ?Ñ?ке по Ñ?аÑ?пÑ?авама"
 msgid "_Group By Threads"
 msgstr "Ð?Ñ?Ñ?пиÑ?и по Ñ?аÑ?пÑ?авама"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Ð?оÑ?Ñ?ка"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
-msgstr "Ð?о_даÑ? поÑ?иÑ?аоÑ?а Ñ? именик"
+msgstr "Ð?о_даÑ? поÑ?иÑ?аоÑ?а Ñ? адÑ?еÑ?аÑ?"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
@@ -22216,7 +20770,7 @@ msgstr "Ð?Ñ?и_мени Ñ?илÑ?еÑ?е"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "Ð?одаÑ? поÑ?иÑ?аоÑ?а Ñ? именик"
+msgstr "Ð?одаÑ? поÑ?иÑ?аоÑ?а Ñ? адÑ?еÑ?аÑ?"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
@@ -22455,199 +21009,184 @@ msgid "Paste messages from the clipboard"
 msgstr "УбаÑ?и поÑ?Ñ?кÑ?(е) из Ñ?пиÑ?ка иÑ?еÑ?ака"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "Ð?оÑ?аÑ?и но_вÑ? поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Ð?оÑ?аÑ?и од_говоÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?авнÑ? Ñ?аÑ?Ñ?иклÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Ð?оÑ?аÑ?и одговоÑ? на поÑ?Ñ?кÑ? Ñ? Ñ?авнÑ? Ñ?аÑ?Ñ?иклÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Ð?Ñ?_еÑ?Ñ?одна важна поÑ?Ñ?ка"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
-msgstr "Ð?Ñ?егледаÑ? поÑ?Ñ?кÑ? за Ñ?Ñ?ампÑ?"
+msgstr "Ð?Ñ?егледаÑ? поÑ?Ñ?кÑ? пÑ?ед Ñ?Ñ?ампÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "ШÑ?ампаÑ? овÑ? поÑ?Ñ?кÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "Ð?Ñ?еÑ?_Ñ?меÑ?и"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Ð?Ñ?еÑ?_Ñ?меÑ?ава (без Ñ?иÑ?аÑ?а) изабÑ?анÑ? поÑ?Ñ?кÑ? некоме"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Ð?Ñ?аÑ?и Ñ?екÑ?Ñ? на оÑ?игиналнÑ? велиÑ?инÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "СаÑ?Ñ?ваÑ? поÑ?Ñ?кÑ? као Ñ?екÑ?Ñ?Ñ?алнÑ? даÑ?оÑ?екÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на допиÑ?нÑ? _лиÑ?Ñ?Ñ?..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге од пÑ?има_лаÑ?а..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на н_аÑ?лов..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "ФаÑ?Ñ?икла пÑ?еÑ?Ñ?аге на _поÑ?иÑ?аоÑ?а..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Ð?Ñ?еÑ?Ñ?ажи Ñ?екÑ?Ñ? Ñ? Ñ?елÑ? пÑ?иказане поÑ?Ñ?ке"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Ð?забеÑ?и _Ñ?ав Ñ?екÑ?Ñ?"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Ð?забеÑ?и Ñ?ав Ñ?екÑ?Ñ? Ñ? поÑ?Ñ?Ñ?и"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Ð?одеÑ?и Ñ?Ñ?Ñ?анÑ? за Ñ?екÑ?Ñ?и Ñ?Ñ?ампаÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Ð?Ñ?икажи Ñ?Ñ?епÑ?Ñ?Ñ?и кÑ?Ñ?Ñ?оÑ? Ñ? Ñ?елÑ? пÑ?иказаниÑ? поÑ?Ñ?ка"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Ð?Ñ?икажи поÑ?Ñ?кÑ? Ñ?а Ñ?вим заглавÑ?има е-поÑ?Ñ?е"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Ð?Ñ?икажи извоÑ?ни код елекÑ?Ñ?онÑ?ке поÑ?Ñ?ке"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Ð?овÑ?аÑ?и изабÑ?ане поÑ?Ñ?ке"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "Ð?е_важно"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "У_маÑ?и"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "Ð?Ñ?и_ложено"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Ð?еÑ?од Ñ?_меÑ?аÑ?а"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "Скло_ни ознакÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "_Ð?бÑ?иÑ?и поÑ?Ñ?кÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "Ð?_Ñ?онаÑ?и Ñ? поÑ?Ñ?Ñ?и..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "Ð?знаÑ?_и као завÑ?Ñ?ено"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Ð?ди на"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Ð?ажно"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "УнÑ?Ñ?_аÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Ð?Ñ?бÑ?е"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "_УÑ?иÑ?аÑ? Ñ?лике"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "Ð?зво_Ñ?ни код поÑ?Ñ?ке"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_СледеÑ?а поÑ?Ñ?ка"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Ð?оÑ?мална велиÑ?ина"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "Ð?и_Ñ?е Ñ?Ñ?бÑ?е"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "_Ð?Ñ?воÑ?и Ñ? новом пÑ?озоÑ?Ñ?"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Ð?Ñ?еÑ?Ñ?одна поÑ?Ñ?ка"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_ЦиÑ?иÑ?ано"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "Ð?Ñ?о_Ñ?иÑ?аÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_СаÑ?Ñ?ваÑ? поÑ?Ñ?кÑ?..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "Ð?_овÑ?аÑ?и поÑ?Ñ?кÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_Ð?епÑ?оÑ?иÑ?ано"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "Ув_еÑ?аÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "Ув_еÑ?аÑ?"
 
@@ -22655,9 +21194,10 @@ msgstr "Ув_еÑ?аÑ?"
 msgid "Close"
 msgstr "Ð?аÑ?воÑ?и"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
-msgstr "Ð?лавна палеÑ?а алаÑ?а"
+msgstr "Ð?лавна Ñ?Ñ?ака алаÑ?а"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
@@ -22693,19 +21233,19 @@ msgstr "_Ð?Ñ?воÑ?и белеÑ?кÑ?"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "Умножи изабÑ?ана задÑ?жеÑ?а"
+msgstr "Умножи изабÑ?ане задаÑ?ке"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
-msgstr "Ð?Ñ?еÑ?и изабÑ?ана задÑ?жеÑ?а"
+msgstr "Ð?Ñ?еÑ?и изабÑ?ане задаÑ?ке"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr "Ð?бÑ?иÑ?и завÑ?Ñ?ена задÑ?жеÑ?а"
+msgstr "Ð?бÑ?иÑ?и завÑ?Ñ?ене задаÑ?ке"
 
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr "Ð?бÑ?иÑ?и изабÑ?ана задÑ?жеÑ?а"
+msgstr "Ð?бÑ?иÑ?и изабÑ?ане задаÑ?ке"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
@@ -22713,35 +21253,35 @@ msgstr "Ð?зна_Ñ?и као завÑ?Ñ?ено"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr "Ð?бележи изабÑ?ана задÑ?жеÑ?а као завÑ?Ñ?ена"
+msgstr "Ð?бележи изабÑ?ане задаÑ?ке као завÑ?Ñ?ене"
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
-msgstr "УбаÑ?и задÑ?жеÑ?а из Ñ?пиÑ?ка иÑ?еÑ?ака"
+msgstr "УбаÑ?и задаÑ?ке из Ñ?пиÑ?ка иÑ?еÑ?ака"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "Ð?Ñ?егледа Ñ?пиÑ?ак задÑ?жеÑ?а за Ñ?Ñ?ампÑ?"
+msgstr "Ð?Ñ?егледа Ñ?пиÑ?ак задаÑ?ака пÑ?ед Ñ?Ñ?ампÑ?"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "ШÑ?ампаÑ? Ñ?пиÑ?ак задÑ?жеÑ?а"
+msgstr "ШÑ?ампаÑ? Ñ?пиÑ?ак задаÑ?ака"
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "Ð?Ñ?икажи пÑ?озоÑ? за пÑ?еглед задÑ?жеÑ?а"
+msgstr "Ð?Ñ?икажи пÑ?озоÑ? за пÑ?еглед задаÑ?ака"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "Ð?Ñ?еглед за_дÑ?жеÑ?а"
+msgstr "Ð?Ñ?еглед за_даÑ?ака"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
-msgstr "Ð?Ñ?егледа изабÑ?ано задÑ?жеÑ?е"
+msgstr "Ð?Ñ?егледа изабÑ?ани задаÑ?ак"
 
 #: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
-msgstr "_Ð?Ñ?воÑ?и задÑ?жеÑ?е"
+msgstr "_Ð?Ñ?воÑ?и задаÑ?ак"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -22749,11 +21289,11 @@ msgstr "Ð? Ð?волÑ?Ñ?иÑ?и..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
-msgstr "Ð?змени подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е"
+msgstr "Ð?змени поÑ?Ñ?авке Ð?волÑ?Ñ?иÑ?е"
 
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
-msgstr "Ð?еÑ?а видÑ?ивоÑ?Ñ? палеÑ?е алаÑ?а"
+msgstr "Ð?еÑ?а видÑ?ивоÑ?Ñ? Ñ?Ñ?аке алаÑ?а"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
@@ -22761,8 +21301,7 @@ msgstr "Ð?Ñ?ваÑ?а нов пÑ?озоÑ? за пÑ?иказ ове Ñ?аÑ?Ñ?икл
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Ð?Ñ?иказÑ?Ñ?е дÑ?гмад пÑ?озоÑ?а коÑ?иÑ?Ñ?еÑ?ем подеÑ?аваÑ?а палеÑ?е алаÑ?а Ñ?адне повÑ?Ñ?ине"
+msgstr "Ð?Ñ?иказÑ?Ñ?е дÑ?гмад пÑ?озоÑ?а коÑ?иÑ?Ñ?еÑ?ем поÑ?Ñ?авке Ñ?Ñ?еаке алаÑ?а Ñ?адне повÑ?Ñ?ине"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -22822,7 +21361,7 @@ msgstr "Ð?о_деÑ?и Ñ?Ñ?Ñ?анÑ?..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
-msgstr "Ð?оÑ?Ñ?ав_ке"
+msgstr "Ð?одеÑ?а_ваÑ?а"
 
 #: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
@@ -22834,7 +21373,7 @@ msgstr "СлаÑ?е / п_Ñ?имаÑ?е"
 
 #: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
-msgstr "ШаÑ?е пÑ?ипÑ?емÑ?ене и довлаÑ?и нове пÑ?едмеÑ?е"
+msgstr "ШаÑ?е пÑ?ипÑ?емÑ?ене и довлаÑ?и нове Ñ?Ñ?авке"
 
 #: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
@@ -22842,15 +21381,15 @@ msgstr "Ð?одеÑ?аваÑ?е Ð?илоÑ?а"
 
 #: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
-msgstr "Ð?Ñ?икажи боÑ?нÑ? о_блаÑ?Ñ?"
+msgstr "Ð?Ñ?икажи боÑ?нÑ? _Ñ?Ñ?акÑ?"
 
 #: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
-msgstr "Ð?Ñ?икажи _линиÑ?а Ñ?а Ñ?Ñ?аÑ?ем"
+msgstr "Ð?Ñ?икажи Ñ?Ñ?акÑ? _Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
 #: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
-msgstr "Ð?Ñ?икажи _палеÑ?Ñ? алаÑ?а"
+msgstr "Ð?Ñ?икажи Ñ?Ñ?акÑ? _алаÑ?а"
 
 #: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
@@ -22874,15 +21413,15 @@ msgstr "Ð?иÑ?а да ли Ñ?емо Ñ?адиÑ?и ван мÑ?еже."
 
 #: ../ui/evolution.xml.h:36
 msgid "Tool_bar Style"
-msgstr "СÑ?ил па_леÑ?е алаÑ?а"
+msgstr "СÑ?ил Ñ?Ñ?а_ке алаÑ?а"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
-msgstr "Ð?Ñ?икажи/СакÑ?иÑ? боÑ?нÑ? облаÑ?Ñ?"
+msgstr "Ð?Ñ?икажи/Ñ?акÑ?иÑ? боÑ?нÑ? Ñ?Ñ?акÑ?"
 
 #: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
-msgstr "Ð?Ñ?икажи/СакÑ?иÑ? линиÑ?Ñ? Ñ?Ñ?аÑ?а"
+msgstr "Ð?Ñ?икажи/Ñ?акÑ?иÑ? Ñ?Ñ?акÑ? Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
 #: ../ui/evolution.xml.h:39
 msgid "Work _Offline"
@@ -22942,9 +21481,10 @@ msgstr "Ð?Ñ?ема _пÑ?едÑ?зеÑ?Ñ?"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr "_Ð?аÑ?Ñ?е именика"
+msgstr "_Ð?аÑ?Ñ?е адÑ?еÑ?аÑ?а"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Ð?Ñ?еглед _Ñ?пиÑ?ка"
 
@@ -22974,7 +21514,7 @@ msgstr "Ð?ао Ñ?аÑ?Ñ?икла _Ð?оÑ?лаÑ?о"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
-msgstr "Ð?Ñ?ема Ñ?_Ñ?аÑ?Ñ?"
+msgstr "Ð?Ñ?ема Ñ?_Ñ?аÑ?Ñ?Ñ?Ñ?"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
@@ -23006,16 +21546,16 @@ msgstr "Са _Ñ?оком"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "Са _Ñ?Ñ?аÑ?ем"
+msgstr "Са _Ñ?Ñ?аÑ?Ñ?Ñ?ом"
 
 # УнивеÑ?зално вÑ?еме, или УТ
 # Ð?аÑ?да УÐ??
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -23037,26 +21577,25 @@ msgstr "Ð?ени за подеÑ?аваÑ?е вÑ?еменÑ?ке зоне"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Ð?оÑ?иÑ?Ñ?иÑ?е леви Ñ?аÑ?Ñ?еÑ? миÑ?а да Ñ?веÑ?аÑ?е мапÑ? и изабеÑ?еÑ?е вÑ?еменÑ?кÑ? зонÑ?.\n"
 "Ð?оÑ?иÑ?Ñ?иÑ?е деÑ?ни Ñ?аÑ?Ñ?еÑ? миÑ?а за Ñ?маÑ?иваÑ?е."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Ð?биÑ?ка"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ð?дÑ?еди пÑ?егледе за %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Ð?дÑ?еди пÑ?егледе"
 
@@ -23066,18 +21605,17 @@ msgid "Define Views for \"%s\""
 msgstr "Ð?дÑ?еди пÑ?егледе за â??%sâ??"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Табела"
 
 # bug(slobo): инÑ?Ñ?анÑ?а, пÑ?имеÑ?ак, погледаÑ?...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "СÑ?Ñ?Ñ?кÑ?Ñ?Ñ?а"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "СаÑ?Ñ?ваÑ? Ñ?Ñ?енÑ?Ñ?ни пÑ?еглед"
 
@@ -23090,17 +21628,17 @@ msgid "_Replace existing view"
 msgstr "_Ð?амени поÑ?Ñ?оÑ?еÑ?и пÑ?еглед"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Ð?Ñ?илагоÑ?ен пÑ?еглед"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "ЧÑ?ва пÑ?илагоÑ?ен пÑ?еглед"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "Ð?дÑ?еди пÑ?егледе..."
 
@@ -23108,32 +21646,32 @@ msgstr "Ð?дÑ?еди пÑ?егледе..."
 msgid "C_urrent View"
 msgstr "Т_Ñ?енÑ?Ñ?ни пÑ?еглед"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Ð?иÑ?а пÑ?еглед: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "ТÑ?енÑ?Ñ?ан пÑ?еглед Ñ?е коÑ?иÑ?ник подеÑ?ио"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "СаÑ?Ñ?ваÑ? пÑ?илагоÑ?ен пÑ?еглед..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "ЧÑ?ва Ñ?Ñ?енÑ?Ñ?ни коÑ?иÑ?ниÑ?ки пÑ?еглед"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Ð?Ñ?ави или меÑ?а пÑ?егледе"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Ð?Ñ?оизводÑ?а"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Ð?дÑ?еди нови пÑ?еглед"
 
@@ -23149,64 +21687,200 @@ msgstr "Тип пÑ?егледа"
 msgid "Type of view:"
 msgstr "Тип пÑ?егледа:"
 
-#: ../widgets/misc/e-attachment-bar.c:1138
-msgid "Attachment Bar"
-msgstr "Ð?иниÑ?а пÑ?илога"
+#: ../widgets/misc/e-attachment.c:990
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "Attached message"
+msgstr "Ð?Ñ?иложена поÑ?Ñ?ка"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773
+#: ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+#| msgid "attachment"
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1822
+#: ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Ð?пеÑ?аÑ?иÑ?а Ñ?Ñ?иÑ?аваÑ?а веÑ? Ñ?е Ñ? Ñ?окÑ?"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1830
+#: ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "Ð?пеÑ?аÑ?иÑ?а Ñ?Ñ?ваÑ?а веÑ? Ñ?е Ñ? Ñ?окÑ?"
+
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?илагаÑ?е даÑ?оÑ?еке %s: %s"
+#| msgid "Could not load address book"
+msgid "Could not load '%s'"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аÑ?и â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:1926
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?илагаÑ?е даÑ?оÑ?еке %s: ниÑ?е Ñ?егÑ?лаÑ?на даÑ?оÑ?ека"
+#| msgid "Content type of the attachment."
+msgid "Could not load the attachment"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аÑ?и пÑ?илог"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+#| msgid "Could not open the link."
+msgid "Could not open the attachment"
+msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и пÑ?илог"
+
+#: ../widgets/misc/e-attachment.c:2635
+#| msgid "An attachment to add."
+msgid "Attachment contents not loaded"
+msgstr "СадÑ?жаÑ? пÑ?илога ниÑ?е Ñ?Ñ?иÑ?ан"
+
+# * found, so just bail completely.
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?аÑ?Ñ?ваÑ?и â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+#| msgid "Content type of the attachment."
+msgid "Could not save the attachment"
+msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?аÑ?Ñ?ваÑ?и пÑ?илог"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Ð?Ñ?обине пÑ?илога"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Ð?ме даÑ?оÑ?еке:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+#| msgid "F_ilename:"
+msgid "_Filename:"
+msgstr "_Ð?ме даÑ?оÑ?еке:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+#| msgid "MIME Type"
+msgid "MIME Type:"
 msgstr "MIME Ñ?ип:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Ð?Ñ?едложи аÑ?Ñ?омаÑ?Ñ?ки пÑ?иказ пÑ?илога"
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#| msgid "Set as _Background"
+msgid "Could not set as background"
+msgstr "Ð?иÑ?е могÑ?Ñ?е поÑ?Ñ?авиÑ?и као позадинÑ?"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#| msgid "Could not open the link."
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Ð?е могÑ? да оÑ?воÑ?им везÑ?."
+msgstr[1] "Ð?иÑ?е могÑ?Ñ?е поÑ?лаÑ?и пÑ?илоге"
+msgstr[2] "Ð?иÑ?е могÑ?Ñ?е поÑ?лаÑ?и пÑ?илога"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#| msgid "Send To:"
+msgid "_Send To..."
+msgstr "_Ð?оÑ?аÑ?и за..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#| msgid "Select folder to save selected attachments..."
+msgid "Send the selected attachments somewhere"
+msgstr "ШаÑ?е изабÑ?ане пÑ?илоге негде"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#| msgid "Loading..."
+msgid "Loading"
+msgstr "УÑ?иÑ?аваÑ?е"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#| msgid "Shading"
+msgid "Saving"
+msgstr "ЧÑ?ваÑ?е"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "СакÑ?иÑ? ли_ниÑ?Ñ? пÑ?илога"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "Ð?Ñ?икажи лини_Ñ?Ñ? пÑ?илога"
+
+#: ../widgets/misc/e-attachment-store.c:541
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgid "Add Attachment"
+msgstr "Ð?одаÑ? пÑ?илог"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "Ð?Ñ?и_ложи"
+
+#: ../widgets/misc/e-attachment-store.c:607
+#| msgid "Save attachments"
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "СаÑ?Ñ?ваÑ? пÑ?илог"
+msgstr[1] "СаÑ?Ñ?ваÑ? пÑ?илоге"
+msgstr[2] "СаÑ?Ñ?ваÑ? пÑ?илога"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "СаÑ?_Ñ?ваÑ? Ñ?ве"
+
+#: ../widgets/misc/e-attachment-view.c:326
+#| msgid "_Add attachment..."
+msgid "A_dd Attachment..."
+msgstr "Ð?о_даÑ? пÑ?илог..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+#| msgid "Open in %s..."
+msgid "Open with \"%s\""
+msgstr "Ð?Ñ?воÑ?и Ñ?а â??%sâ??"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+#| msgid "Remind _missing attachments"
+msgid "Open this attachment in %s"
+msgstr "Ð?Ñ?воÑ?и оваÑ? пÑ?илог Ñ? %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Ð?еÑ?еÑ?ни календаÑ?"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645
-#: ../widgets/text/e-text.c:3646
+#: ../widgets/misc/e-canvas-background.c:455
+#: ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Ð?оÑ?а иÑ?пÑ?Ñ?аваÑ?а"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/misc/e-canvas-background.c:469
+#: ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK боÑ?а иÑ?пÑ?Ñ?аваÑ?а"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/misc/e-canvas-background.c:476
+#: ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Ð?Ñ?Ñ?аÑ?каÑ?"
 
@@ -23230,26 +21904,28 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Ð?аÑ?маÑ?а Ñ?иÑ?ина"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Ð?аÑ?маÑ?а Ñ?иÑ?ина"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101
+#: ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Размак"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Сада"
 
@@ -23258,7 +21934,7 @@ msgstr "Сада"
 msgid "The time must be in the format: %s"
 msgstr "Ð?Ñ?еме моÑ?а биÑ?и Ñ? Ñ?оÑ?маÑ?Ñ?: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ð?Ñ?едноÑ?Ñ? поÑ?Ñ?оÑ?ка моÑ?а биÑ?и измеÑ?Ñ? 0 и 100"
 
@@ -23318,13 +21994,16 @@ msgstr "Ð?ападноевÑ?опÑ?ка"
 msgid "Western European, New"
 msgstr "Ð?ападноевÑ?опÑ?ка, нова"
 
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "ТÑ?адиÑ?ионална"
 
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Ð?оÑ?едноÑ?Ñ?авÑ?ена"
 
@@ -23357,156 +22036,100 @@ msgstr "Ð?Ñ?Ñ?го..."
 msgid "Ch_aracter Encoding"
 msgstr "Ð?одна Ñ?Ñ?_Ñ?ана"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Ð?аÑ?Ñ?м и вÑ?еме"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Ð?ео Ñ?екÑ?Ñ?а за Ñ?ноÑ? даÑ?Ñ?ма"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е на ово дÑ?гме за пÑ?иказ календаÑ?а"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "Ð?квиÑ? за избоÑ? вÑ?емена"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "_Сада"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_Ð?анаÑ?"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Ð?еиÑ?пÑ?аван даÑ?Ñ?м"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Ð?еиÑ?пÑ?авно вÑ?еме"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "РазгÑ?анаÑ?о"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "Ð?а ли Ñ?е Ñ?Ñ?абло Ñ?азгÑ?анаÑ?о или не"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "ТекÑ?Ñ? ознаке Ñ?Ñ?абла"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Ð?оÑ?иÑ?Ñ?и подвлаÑ?еÑ?е"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Ð?ко Ñ?е поÑ?Ñ?авÑ?ено, подвлаÑ?еÑ?е Ñ? Ñ?екÑ?Ñ?Ñ? ознаÑ?ава знак коÑ?и Ñ?е Ñ?е коÑ?иÑ?Ñ?иÑ?и "
-"као пÑ?еÑ?иÑ?а на Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?и"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Размак измеÑ?Ñ? ознаке и Ñ?адÑ?жаног елеменÑ?а"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Ð?леменÑ? ознаке"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Ð?леменÑ? коÑ?и Ñ?е пÑ?иказÑ?Ñ?е Ñ?меÑ?Ñ?о обиÑ?не ознаке Ñ?Ñ?абла"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "Ð?елиÑ?ина Ñ?Ñ?абла"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "Ð?елиÑ?ина Ñ?Ñ?Ñ?елиÑ?е Ñ?Ñ?абла"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Размак показиваÑ?а"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Размак око Ñ?Ñ?Ñ?елиÑ?е Ñ?Ñ?абла"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123
+#: ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306
+#: ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Ð?апÑ?една пÑ?еÑ?Ñ?ага"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "СаÑ?Ñ?ваÑ? пÑ?еÑ?Ñ?агÑ?"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Ð?Ñ?еÑ?Ñ?аге"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Ð?Ñ?еÑ?Ñ?аге"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_СаÑ?Ñ?ваÑ? пÑ?еÑ?Ñ?агÑ?..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_УÑ?еди Ñ?аÑ?Ñ?ване пÑ?еÑ?Ñ?аге..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_Ð?апÑ?една пÑ?еÑ?Ñ?ага..."
 
 # bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Ñ?вим налозима"
 
 # bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Ñ?екÑ?Ñ?ем налогÑ?"
 
 # bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Ñ?екÑ?Ñ?оÑ? Ñ?аÑ?Ñ?икли"
 
-# bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Ñ?екÑ?Ñ?оÑ? поÑ?Ñ?Ñ?и"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Ð?забеÑ?иÑ?е Ñ?ликÑ?"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Ð?аÑ?Ñ?а Ñ?веÑ?а"
 
-#: ../widgets/misc/e-map.c:629
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Ð?лаÑ? за избоÑ? вÑ?еменÑ?ке зоне помоÑ?Ñ? миÑ?а. ТаÑ?Ñ?аÑ?Ñ?Ñ?ом Ñ?е избоÑ? вÑ?еменÑ?ке зоне "
-"вÑ?Ñ?и из доÑ?ег оквиÑ?а."
+#: ../widgets/misc/e-map.c:607
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "Ð?лаÑ? за избоÑ? вÑ?еменÑ?ке зоне помоÑ?Ñ? миÑ?а. ТаÑ?Ñ?аÑ?Ñ?Ñ?ом Ñ?е избоÑ? вÑ?еменÑ?ке зоне вÑ?Ñ?и из доÑ?ег оквиÑ?а."
 
 #: ../widgets/misc/e-online-button.c:106
 msgid "Online"
@@ -23516,103 +22139,109 @@ msgstr "Ð?а мÑ?ежи"
 msgid "The button state is online"
 msgstr "СÑ?аÑ?е дÑ?гмеÑ?а Ñ?е на мÑ?ежи"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "УÑ?клади Ñ?а:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "УÑ?клади лиÑ?не запиÑ?е:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "УÑ?клади каÑ?егоÑ?иÑ?е:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435
+#: ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Ð?Ñ?азна поÑ?Ñ?ка"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Ð?одел пÑ?еиÑ?пÑ?Ñ?аваÑ?а"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "ШиÑ?ина колоне"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92
+#: ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Ð?Ñ?еÑ?Ñ?ага"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "Ð?ликниÑ?е овде да пÑ?омениÑ?е вÑ?Ñ?Ñ?Ñ? пÑ?еÑ?Ñ?аге"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "_Ð?Ñ?еÑ?Ñ?ажи"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "Ð?Ñ?о_наÑ?и Ñ?ада"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_Ð?Ñ?иÑ?Ñ?и"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
-msgstr "Ð?Ð? пÑ?едмеÑ?а"
+msgstr "Ð?Ð? Ñ?Ñ?авке"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/misc/e-search-bar.c:906
+#: ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "ТекÑ?Ñ?"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "Ð?Ñ?ика_жи: "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "Ð?_Ñ?еÑ?Ñ?ажи"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " _Ñ? "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Ред кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Ð?олона кÑ?Ñ?Ñ?оÑ?а"
 
 # bug(slobo): можда Ñ?азвÑ?Ñ?Ñ?аваÑ?
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "РазвÑ?Ñ?Ñ?аваÑ?е"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Режим избоÑ?а"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Режим кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Ð?ада Ñ?е обÑ?и_Ñ?ано:"
 
@@ -23630,25 +22259,25 @@ msgstr "<b>Ð?овÑ?аÑ?но обавеÑ?Ñ?еÑ?е</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
-msgstr "<b>Ð?Ñ?аÑ?еÑ?е Ñ?Ñ?аÑ?а</b>"
+msgstr "<b>Ð?Ñ?аÑ?еÑ?е Ñ?Ñ?аÑ?Ñ?Ñ?а</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "Ð?_Ñ?Ñ?омаÑ?Ñ?ки бÑ?иÑ?и поÑ?лаÑ? пÑ?едмеÑ?"
+msgstr "Ð?_Ñ?Ñ?омаÑ?Ñ?ки бÑ?иÑ?и поÑ?лаÑ?Ñ? Ñ?Ñ?авкÑ?"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
-msgstr "Ð?а_пÑ?ави поÑ?лаÑ? пÑ?едмеÑ? за пÑ?аÑ?еÑ?е подаÑ?ка"
+msgstr "Ð?а_пÑ?ави поÑ?лаÑ?Ñ? Ñ?Ñ?авкÑ? за пÑ?аÑ?еÑ?е подаÑ?ка"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Ð?Ñ?по_Ñ?Ñ?Ñ?ено и оÑ?воÑ?ено"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
-msgstr "Ð?пÑ?_Ñ?е могÑ?Ñ?ноÑ?Ñ?и"
+msgstr "Ð?пÑ?_Ñ?е опÑ?иÑ?е"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23656,7 +22285,7 @@ msgstr ""
 "Ð?ема\n"
 "Ð?Ñ?ималаÑ? поÑ?Ñ?е"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23665,22 +22294,22 @@ msgid ""
 "Top Secret\n"
 "For Your Eyes Only"
 msgstr ""
-"Ð?оÑ?манлна\n"
+"Ð?оÑ?мална\n"
 "Ð?аконом заÑ?Ñ?иÑ?ена\n"
 "Ð?овеÑ?Ñ?ива\n"
 "ТаÑ?на\n"
 "Ð?Ñ?Ñ?Ñ?нÑ?ка Ñ?аÑ?на\n"
 "Само за Ñ?воÑ?е оÑ?и"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "Ð?аÑ?Ñ?еван о_дговоÑ?"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
-msgstr "Ð?Ñ?аÑ?еÑ?е Ñ?Ñ?а_Ñ?а"
+msgstr "Ð?Ñ?аÑ?еÑ?е Ñ?Ñ?а_Ñ?Ñ?Ñ?а"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23692,30 +22321,35 @@ msgstr ""
 "Ð?биÑ?но\n"
 "Ð?иÑ?ко"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Ð?ада Ñ?е пÑ?и_Ñ?ваÑ?ено: "
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Ð?о завÑ?Ñ?_еÑ?кÑ?:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Ð?ада Ñ?е одби_Ñ?ено:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "Ун_Ñ?Ñ?аÑ?"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_Ð?оÑ?ле:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Сви подаÑ?и"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+#| msgid "_Classification"
+msgid "_Classification:"
+msgstr "_Ð?лаÑ?иÑ?икаÑ?иÑ?а:"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23742,46 +22376,26 @@ msgid "_When opened:"
 msgstr "_Ð?ада Ñ?е оÑ?воÑ?ено:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завÑ?Ñ?ено)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
-msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е овде да поÑ?еÑ?иÑ?е адÑ?еÑ?Ñ?"
-
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "УÑ?еди Ð?иÑ?Ñ?Ñ? главниÑ? каÑ?егоÑ?иÑ?а..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Ð?Ñ?едмеÑ?(и) пÑ?ипада(Ñ?Ñ?) овим _каÑ?егоÑ?иÑ?ама:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Ð?оÑ?Ñ?Ñ?пне _каÑ?егоÑ?иÑ?е:"
+msgstr "Ð?ликниÑ?е овде да поÑ?еÑ?иÑ?е адÑ?еÑ?Ñ?"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "каÑ?егоÑ?иÑ?е"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "иÑ?каÑ?Ñ?Ñ?а лиÑ?Ñ?а"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Ð?забÑ?ана колона"
@@ -23794,23 +22408,23 @@ msgstr "ФокÑ?Ñ?иÑ?ана колона"
 msgid "Unselected Column"
 msgstr "Ð?еизабÑ?ана колона"
 
-#: ../widgets/table/e-cell-text.c:1799
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Ð?Ñ?еÑ?Ñ?Ñ?ана колона"
 
-#: ../widgets/table/e-cell-text.c:1806
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Ð?одвÑ?Ñ?ена колона"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Ð?одебÑ?ана колона"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Ð?олона Ñ? боÑ?и"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Ð?олона боÑ?а Ñ? позадини"
 
@@ -23818,11 +22432,13 @@ msgstr "Ð?олона боÑ?а Ñ? позадини"
 msgid "State"
 msgstr "СÑ?аÑ?е"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(РаÑ?Ñ?Ñ?Ñ?е)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Ð?падаÑ?Ñ?Ñ?е)"
 
@@ -23834,12 +22450,12 @@ msgstr "Ð?иÑ?е Ñ?азвÑ?Ñ?Ñ?ано"
 msgid "No grouping"
 msgstr "Ð?ез гÑ?Ñ?пиÑ?аÑ?а"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Ð?Ñ?икажи поÑ?а"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Ð?оÑ?Ñ?Ñ?пна поÑ?а"
 
@@ -23848,7 +22464,7 @@ msgid "A_vailable Fields:"
 msgstr "Ð?о_Ñ?Ñ?Ñ?пна поÑ?а:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "РаÑ?Ñ?Ñ?Ñ?е"
 
@@ -23861,13 +22477,13 @@ msgid "Clear _All"
 msgstr "Ð?Ñ?иÑ?Ñ?и _Ñ?ве"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Ð?падаÑ?Ñ?Ñ?е"
 
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "Ð?Ñ?Ñ?пиÑ?и пÑ?едмеÑ?е по"
+msgstr "Ð?Ñ?Ñ?пиÑ?и Ñ?Ñ?авке по"
 
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
@@ -23895,7 +22511,7 @@ msgstr "РазвÑ?Ñ?Ñ?аÑ?"
 
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
-msgstr "РазвÑ?Ñ?Ñ?аÑ? пÑ?едмеÑ?е по"
+msgstr "РазвÑ?Ñ?Ñ?аÑ? Ñ?Ñ?авке по"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
@@ -23921,22 +22537,7 @@ msgstr "_Ð?Ñ?икажи ова поÑ?а по Ñ?едÑ?:"
 msgid "_Sort..."
 msgstr "_РазвÑ?Ñ?Ñ?аÑ?..."
 
-# Ð?Ñ?евÑ?Ñ?и-и-Ð?Ñ?Ñ?Ñ?и
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "Ð?иÐ? код"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "Ð?Ñ?но заглавÑ?е"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Ð?одаÑ? колонÑ?..."
 
@@ -23952,7 +22553,7 @@ msgstr ""
 "Ð?а додаваÑ?е колоне Ñ? Ñ?абелÑ?, пÑ?евÑ?Ñ?иÑ?е\n"
 "Ñ?е на меÑ?Ñ?о где желиÑ?е да Ñ?е поÑ?ави."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23960,7 +22561,7 @@ msgstr[0] "%s : %s (%d Ñ?Ñ?авка)"
 msgstr[1] "%s : %s (%d Ñ?Ñ?авке)"
 msgstr[2] "%s : %s (%d Ñ?Ñ?авки)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23968,1149 +22569,1690 @@ msgstr[0] "%s (%d Ñ?Ñ?авка)"
 msgstr[1] "%s (%d Ñ?Ñ?авке)"
 msgstr[2] "%s (%d Ñ?Ñ?авки)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020
+#: ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Редови наизмениÑ?ниÑ? боÑ?а"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Ð?оложене линиÑ?е за Ñ?Ñ?Ñ?аÑ?е"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "УÑ?пÑ?авне линиÑ?е за Ñ?Ñ?Ñ?аÑ?е"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "СÑ?едиÑ?Ñ?е Ñ?Ñ?Ñ?аÑ?а"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048
+#: ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Режим кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013
+#: ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Ð?одел за избоÑ?"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055
+#: ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316
+#: ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Ð?аÑ?веÑ?а дÑ?жина"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089
+#: ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323
+#: ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "УÑ?еднаÑ?ена виÑ?ина Ñ?едова"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Ð?амÑ?знÑ?Ñ?о"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Ð?Ñ?илагодиÑ?е Ñ?Ñ?енÑ?Ñ?ни пÑ?еглед"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "РазвÑ?Ñ?Ñ?аÑ? _Ñ?аÑ?Ñ?Ñ?Ñ?е"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "РазвÑ?Ñ?Ñ?аÑ? _опадаÑ?Ñ?Ñ?е"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "_Ð?е Ñ?азвÑ?Ñ?Ñ?аваÑ?"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Ð?Ñ?Ñ?пиÑ?и по овоме _поÑ?Ñ?"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Ð?Ñ?Ñ?пиÑ?и по _оквиÑ?Ñ?"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Уклони овÑ? _колонÑ?"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Ð?одаÑ? ко_лонÑ?..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "Ð?о_Ñ?авнаÑ?е"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "Ð?а_Ñ?боÑ?е Ñ?клапаÑ?е"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "Ð?бликÑ?Ñ? коло_не..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "Ð?Ñ?ила_годи Ñ?Ñ?енÑ?Ñ?ни пÑ?еглед..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_Ð?оÑ?еÑ?аÑ? по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_Ð?Ñ?илагоÑ?ено"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "Ð?пиÑ? Ñ?онÑ?а"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Ð?еÑ?аÑ?и Ñ?азвÑ?Ñ?Ñ?аваÑ?а"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "СÑ?абло"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Ð?аглавÑ?е Ñ?абеле"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Ð?одел Ñ?абеле"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Ред кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Ð?еÑ?аÑ?и Ñ?азвÑ?Ñ?Ñ?аваÑ?а"
+
+#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Увек пÑ?еÑ?Ñ?ажи"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Ð?оÑ?иÑ?Ñ?иÑ?е клик да додаÑ?е"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "СÑ?абло"
+
+#: ../widgets/table/e-tree.c:3358
+#: ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree пÑ?илагоÑ?иваÑ? Ñ?абеле"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "СÑ?аÑ?инÑ?ки изглед"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?ава линиÑ?е и +/- гÑ?аниÑ?нике."
 
-#: ../widgets/text/e-text.c:2737
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Ð?елиÑ?ина Ñ?Ñ?абла"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Ð?елиÑ?ина Ñ?Ñ?Ñ?елиÑ?е Ñ?Ñ?абла"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Ð?еÑ?оди Ñ?ноÑ?а"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Ð?бÑ?аÑ?иваÑ? догаÑ?аÑ?а"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Ð?одебÑ?ано"
 
-#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
+#: ../widgets/text/e-text.c:3569
+#: ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Ð?Ñ?еÑ?Ñ?Ñ?ано"
 
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3576
+#: ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Ð?еза"
 
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3583
+#: ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Ð?боÑ?Ñ?Ñ?ано"
 
-#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3590
+#: ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Ð?Ñ?еÑ?и Ñ?иÑ?инÑ?"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Ð?Ñ?еÑ?и виÑ?инÑ?"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Ð?Ñ?еÑ?и"
 
-#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Ð?Ñ?пÑ?ни пÑ?авоÑ?гаоник иÑ?еÑ?ка"
 
-#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X помеÑ?аÑ?е"
 
-#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y помеÑ?аÑ?е"
 
-#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675
+#: ../widgets/text/e-text.c:3660
+#: ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "ШиÑ?ина Ñ?екÑ?Ñ?а"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Ð?иÑ?ина Ñ?екÑ?Ñ?а"
 
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?Ñ?и Ñ?аÑ?ке"
 
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "ТÑ?и Ñ?аÑ?ке"
 
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Ð?Ñ?елом Ñ?еда"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Ð?наÑ?и за пÑ?елом"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Ð?аÑ?виÑ?е линиÑ?а"
 
-#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747
+#: ../widgets/text/e-text.c:3730
+#: ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?аÑ? ивиÑ?е"
 
-#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754
+#: ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Ð?озволи нове линиÑ?е"
 
-#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?аÑ? позадинÑ?"
 
-#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?аÑ? дÑ?гме"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
 msgid "Cursor position"
-msgstr "Ð?озиÑ?иÑ?а кÑ?Ñ?зоÑ?а"
+msgstr "Ð?озиÑ?иÑ?а кÑ?Ñ?Ñ?оÑ?а"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784
+#: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "Ð?онÑ?екÑ?Ñ? меÑ?ода Ñ?ноÑ?а"
 
-#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791
+#: ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "УпÑ?авÑ?аÑ? иÑ?каÑ?Ñ?Ñ?им пÑ?озоÑ?ом"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Ð?Ñ?иказ линиÑ?е пÑ?илога"
+#~ msgid "activate"
+#~ msgstr "акÑ?ивиÑ?аÑ?и"
+#~ msgid "3268"
+#~ msgstr "3268"
+#~ msgid "389"
+#~ msgstr "389"
+#~ msgid "636"
+#~ msgstr "636"
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Тип:</b>"
+#~ msgid "Add Address Book"
+#~ msgstr "Ð?одаÑ? именик"
+#~ msgid "Anonymously"
+#~ msgstr "Ð?нонимно"
+#~ msgid "Basic"
+#~ msgstr "Ð?Ñ?новно"
+#~ msgid "Distinguished name"
+#~ msgstr "Ð?оÑ?ебно име"
+#~ msgid "Email address"
+#~ msgstr "Ð?лекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Ð?аÑ?и могÑ?Ñ?е оÑ?нове за пÑ?еÑ?Ñ?агÑ?"
+#~ msgid "Search filter"
+#~ msgstr "Ð?Ñ?опÑ?Ñ?ник пÑ?еÑ?Ñ?аге"
+#~ msgid "Sub"
+#~ msgstr "Ð?од"
+#~ msgid "Using email address"
+#~ msgstr "Ð?оÑ?иÑ?Ñ?еÑ?е елекÑ?Ñ?онÑ?ке адÑ?еÑ?е"
+#~ msgid "Whenever Possible"
+#~ msgstr "Ð?ад год Ñ?е могÑ?Ñ?е"
+#~ msgid "_Add Address Book"
+#~ msgstr "_Ð?одаÑ? именик"
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN глаÑ?ник"
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+#~ msgid "_Notes:"
+#~ msgstr "_Ð?елеÑ?ке:"
+#~ msgid "United States"
+#~ msgstr "СÑ?едиÑ?ене Ð?Ñ?жаве"
+#~ msgid "Afghanistan"
+#~ msgstr "Ð?вганиÑ?Ñ?ан"
+#~ msgid "Albania"
+#~ msgstr "Ð?лбаниÑ?а"
+#~ msgid "Algeria"
+#~ msgstr "Ð?лжиÑ?"
+#~ msgid "American Samoa"
+#~ msgstr "Ð?меÑ?иÑ?ка Самоа"
+#~ msgid "Andorra"
+#~ msgstr "Ð?ндоÑ?а"
+#~ msgid "Angola"
+#~ msgstr "Ð?нгола"
+#~ msgid "Anguilla"
+#~ msgstr "Ð?нгила"
+#~ msgid "Antarctica"
+#~ msgstr "Ð?нÑ?аÑ?кÑ?ик"
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Ð?нÑ?ига и Ð?аÑ?бÑ?да"
+#~ msgid "Argentina"
+#~ msgstr "Ð?Ñ?генÑ?ина"
+#~ msgid "Armenia"
+#~ msgstr "Ð?еÑ?мениÑ?а"
+#~ msgid "Aruba"
+#~ msgstr "Ð?Ñ?Ñ?ба"
+#~ msgid "Australia"
+#~ msgstr "Ð?Ñ?Ñ?Ñ?Ñ?алиÑ?а"
+#~ msgid "Austria"
+#~ msgstr "Ð?Ñ?Ñ?Ñ?Ñ?иÑ?а"
+#~ msgid "Azerbaijan"
+#~ msgstr "Ð?зеÑ?беÑ?Ñ?ан"
+#~ msgid "Bahamas"
+#~ msgstr "Ð?аÑ?ами"
+#~ msgid "Bahrain"
+#~ msgstr "Ð?аÑ?Ñ?еин"
+#~ msgid "Bangladesh"
+#~ msgstr "Ð?англадеÑ?"
+#~ msgid "Barbados"
+#~ msgstr "Ð?аÑ?бадоÑ?"
+#~ msgid "Belarus"
+#~ msgstr "Ð?елоÑ?Ñ?Ñ?иÑ?а"
+#~ msgid "Belgium"
+#~ msgstr "Ð?елгиÑ?а"
+#~ msgid "Belize"
+#~ msgstr "Ð?елизе"
+#~ msgid "Benin"
+#~ msgstr "Ð?енин"
+#~ msgid "Bermuda"
+#~ msgstr "Ð?еÑ?мÑ?да"
+#~ msgid "Bhutan"
+#~ msgstr "Ð?Ñ?Ñ?ан"
+#~ msgid "Bolivia"
+#~ msgstr "Ð?оливиÑ?а"
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Ð?оÑ?на и ХеÑ?Ñ?еговина"
+#~ msgid "Botswana"
+#~ msgstr "Ð?оÑ?вана"
+#~ msgid "Bouvet Island"
+#~ msgstr "Ð?Ñ?ве Ð?Ñ?Ñ?Ñ?во"
+#~ msgid "Brazil"
+#~ msgstr "Ð?Ñ?азил"
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Ð?Ñ?иÑ?анÑ?ка ТеÑ?иÑ?оÑ?иÑ?а Ð?ндиÑ?Ñ?ког Ð?кеана"
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Ð?Ñ?Ñ?неÑ? Ð?аÑ?Ñ?Ñ?алам"
+#~ msgid "Bulgaria"
+#~ msgstr "Ð?Ñ?гаÑ?Ñ?ка"
+#~ msgid "Burkina Faso"
+#~ msgstr "Ð?Ñ?Ñ?кина ФаÑ?о"
+#~ msgid "Burundi"
+#~ msgstr "Ð?Ñ?Ñ?Ñ?нди"
+#~ msgid "Cambodia"
+#~ msgstr "Ð?амбоÑ?а"
+#~ msgid "Cameroon"
+#~ msgstr "Ð?амеÑ?Ñ?н"
+#~ msgid "Canada"
+#~ msgstr "Ð?анада"
+#~ msgid "Cape Verde"
+#~ msgstr "Ð?еленоÑ?Ñ?Ñ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Cayman Islands"
+#~ msgstr "Ð?аÑ?манÑ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Central African Republic"
+#~ msgstr "ЦенÑ?Ñ?алноаÑ?Ñ?иÑ?ка РепÑ?блика"
+#~ msgid "Chad"
+#~ msgstr "Чад"
+#~ msgid "Chile"
+#~ msgstr "Чиле"
+#~ msgid "China"
+#~ msgstr "Ð?ина"
+#~ msgid "Christmas Island"
+#~ msgstr "Ð?ожиÑ?но Ð?Ñ?Ñ?Ñ?во"
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Ð?окоÑ? (Ð?илинг) Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Colombia"
+#~ msgstr "Ð?олÑ?мбиÑ?а"
+#~ msgid "Comoros"
+#~ msgstr "Ð?омоÑ?и"
+#~ msgid "Congo"
+#~ msgstr "Ð?онго"
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Ð?онго, Ð?емокÑ?аÑ?Ñ?ка РепÑ?блика"
+#~ msgid "Cook Islands"
+#~ msgstr "Ð?Ñ?к Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Costa Rica"
+#~ msgstr "Ð?оÑ?Ñ?аÑ?ика"
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Ð?бала СлоноваÑ?е"
+#~ msgid "Croatia"
+#~ msgstr "Ð¥Ñ?ваÑ?Ñ?ка"
+#~ msgid "Cuba"
+#~ msgstr "Ð?Ñ?ба"
+#~ msgid "Cyprus"
+#~ msgstr "Ð?ипаÑ?"
+#~ msgid "Czech Republic"
+#~ msgstr "ЧеÑ?ка РепÑ?блика"
+#~ msgid "Denmark"
+#~ msgstr "Ð?анÑ?ка"
+#~ msgid "Djibouti"
+#~ msgstr "Ð?ибÑ?Ñ?и"
+#~ msgid "Dominica"
+#~ msgstr "Ð?оминика"
+#~ msgid "Dominican Republic"
+#~ msgstr "Ð?оминиканÑ?ка РепÑ?блика"
+#~ msgid "Ecuador"
+#~ msgstr "Ð?квадоÑ?"
+#~ msgid "Egypt"
+#~ msgstr "Ð?гипаÑ?"
+#~ msgid "El Salvador"
+#~ msgstr "Ð?л СалвадоÑ?"
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Ð?кваÑ?оÑ?иÑ?ална Ð?винеÑ?а"
+#~ msgid "Eritrea"
+#~ msgstr "Ð?Ñ?иÑ?Ñ?еÑ?а"
+#~ msgid "Estonia"
+#~ msgstr "Ð?Ñ?Ñ?ониÑ?а"
+#~ msgid "Ethiopia"
+#~ msgstr "Ð?Ñ?иопиÑ?а"
+#~ msgid "Falkland Islands"
+#~ msgstr "ФокландÑ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Faroe Islands"
+#~ msgstr "ФаÑ?Ñ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Fiji"
+#~ msgstr "ФиÑ?и"
+#~ msgid "Finland"
+#~ msgstr "ФинÑ?ка"
+#~ msgid "France"
+#~ msgstr "ФÑ?анÑ?Ñ?Ñ?ка"
+#~ msgid "French Guiana"
+#~ msgstr "ФÑ?анÑ?Ñ?Ñ?ка Ð?иÑ?ана"
+#~ msgid "French Polynesia"
+#~ msgstr "ФÑ?анÑ?Ñ?Ñ?ка Ð?олинезиÑ?а"
+#~ msgid "French Southern Territories"
+#~ msgstr "ФÑ?анÑ?Ñ?Ñ?ке Ð?Ñ?жне ТеÑ?иÑ?оÑ?иÑ?е"
+#~ msgid "Gabon"
+#~ msgstr "Ð?абон"
+#~ msgid "Gambia"
+#~ msgstr "Ð?амбиÑ?а"
+#~ msgid "Georgia"
+#~ msgstr "Ð?Ñ?Ñ?зиÑ?а"
+#~ msgid "Germany"
+#~ msgstr "Ð?емаÑ?ка"
+#~ msgid "Ghana"
+#~ msgstr "Ð?ана"
+#~ msgid "Gibraltar"
+#~ msgstr "Ð?ибÑ?алÑ?аÑ?"
+#~ msgid "Greece"
+#~ msgstr "Ð?Ñ?Ñ?ка"
+#~ msgid "Greenland"
+#~ msgstr "Ð?Ñ?енланд"
+#~ msgid "Grenada"
+#~ msgstr "Ð?Ñ?енада"
+#~ msgid "Guadeloupe"
+#~ msgstr "Ð?вадалÑ?п"
+#~ msgid "Guam"
+#~ msgstr "Ð?Ñ?ам"
+#~ msgid "Guatemala"
+#~ msgstr "Ð?ваÑ?емала"
+#~ msgid "Guernsey"
+#~ msgstr "Ð?виÑ?нзи"
+#~ msgid "Guinea"
+#~ msgstr "Ð?винеÑ?а"
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Ð?винеÑ?а-Ð?иÑ?ао"
+#~ msgid "Guyana"
+#~ msgstr "Ð?ваÑ?ана"
+#~ msgid "Haiti"
+#~ msgstr "ХаиÑ?и"
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "ХеÑ?д и Ð?екдоналд Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Holy See"
+#~ msgstr "СвеÑ?а СÑ?олиÑ?а"
+#~ msgid "Honduras"
+#~ msgstr "ХондÑ?Ñ?аÑ?"
+#~ msgid "Hong Kong"
+#~ msgstr "Хонг Ð?онг"
+#~ msgid "Hungary"
+#~ msgstr "Ð?аÑ?аÑ?Ñ?ка"
+#~ msgid "Iceland"
+#~ msgstr "Ð?Ñ?ланд"
+#~ msgid "India"
+#~ msgstr "Ð?ндиÑ?а"
+#~ msgid "Indonesia"
+#~ msgstr "Ð?ндонезиÑ?а"
+#~ msgid "Iran"
+#~ msgstr "Ð?Ñ?ан"
+#~ msgid "Iraq"
+#~ msgstr "Ð?Ñ?ак"
+#~ msgid "Ireland"
+#~ msgstr "Ð?Ñ?Ñ?ка"
+#~ msgid "Isle of Man"
+#~ msgstr "Човеково Ð?Ñ?Ñ?Ñ?во"
+#~ msgid "Israel"
+#~ msgstr "Ð?зÑ?аел"
+#~ msgid "Italy"
+#~ msgstr "Ð?Ñ?алиÑ?а"
+#~ msgid "Jamaica"
+#~ msgstr "Ð?амаÑ?ка"
+#~ msgid "Japan"
+#~ msgstr "Ð?апан"
+#~ msgid "Jersey"
+#~ msgstr "Ð?еÑ?Ñ?и"
+#~ msgid "Jordan"
+#~ msgstr "Ð?оÑ?дан"
+#~ msgid "Kazakhstan"
+#~ msgstr "Ð?азаÑ?Ñ?Ñ?ан"
+#~ msgid "Kenya"
+#~ msgstr "Ð?ениÑ?а"
+#~ msgid "Kiribati"
+#~ msgstr "Ð?иÑ?ибаÑ?и"
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Ð?оÑ?еÑ?а, Ð?емокÑ?аÑ?Ñ?ка Ð?аÑ?одна РепÑ?блика"
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Ð?оÑ?еÑ?а, РепÑ?блика"
+#~ msgid "Kuwait"
+#~ msgstr "Ð?Ñ?ваÑ?Ñ?"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Ð?иÑ?гиÑ?Ñ?ан"
+#~ msgid "Laos"
+#~ msgstr "Ð?аоÑ?"
+#~ msgid "Latvia"
+#~ msgstr "Ð?аÑ?виÑ?а"
+#~ msgid "Lebanon"
+#~ msgstr "Ð?ибан"
+#~ msgid "Lesotho"
+#~ msgstr "Ð?еÑ?оÑ?о"
+#~ msgid "Liberia"
+#~ msgstr "Ð?ибеÑ?иÑ?а"
+#~ msgid "Libya"
+#~ msgstr "Ð?ибиÑ?а"
+#~ msgid "Liechtenstein"
+#~ msgstr "Ð?иÑ?Ñ?енÑ?Ñ?аÑ?н"
+#~ msgid "Lithuania"
+#~ msgstr "Ð?иÑ?ваниÑ?а"
+#~ msgid "Luxembourg"
+#~ msgstr "Ð?Ñ?кÑ?ембÑ?Ñ?г"
+#~ msgid "Macao"
+#~ msgstr "Ð?акао"
+#~ msgid "Macedonia"
+#~ msgstr "Ð?акедониÑ?а"
+#~ msgid "Madagascar"
+#~ msgstr "Ð?адагаÑ?каÑ?"
+#~ msgid "Malawi"
+#~ msgstr "Ð?алави"
+#~ msgid "Malaysia"
+#~ msgstr "Ð?алезиÑ?а"
+#~ msgid "Maldives"
+#~ msgstr "Ð?алдиви"
+#~ msgid "Mali"
+#~ msgstr "Ð?али"
+#~ msgid "Malta"
+#~ msgstr "Ð?алÑ?а"
+#~ msgid "Marshall Islands"
+#~ msgstr "Ð?аÑ?Ñ?алова Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Martinique"
+#~ msgstr "Ð?аÑ?Ñ?иник"
+#~ msgid "Mauritania"
+#~ msgstr "Ð?аÑ?Ñ?иÑ?аниÑ?а"
+#~ msgid "Mauritius"
+#~ msgstr "Ð?аÑ?Ñ?иÑ?иÑ?Ñ?Ñ?"
+#~ msgid "Mayotte"
+#~ msgstr "Ð?еÑ?оÑ?"
+#~ msgid "Mexico"
+#~ msgstr "Ð?екÑ?ико"
+#~ msgid "Micronesia"
+#~ msgstr "Ð?икÑ?онезиÑ?а"
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Ð?олдавиÑ?а, РепÑ?блика"
+#~ msgid "Monaco"
+#~ msgstr "Ð?онако"
+#~ msgid "Mongolia"
+#~ msgstr "Ð?онголиÑ?а"
+#~ msgid "Montserrat"
+#~ msgstr "Ð?онÑ?еÑ?аÑ?"
+#~ msgid "Morocco"
+#~ msgstr "Ð?аÑ?око"
+#~ msgid "Mozambique"
+#~ msgstr "Ð?озамбик"
+#~ msgid "Myanmar"
+#~ msgstr "Ð?ианмаÑ?"
+#~ msgid "Namibia"
+#~ msgstr "Ð?амибиÑ?а"
+#~ msgid "Nauru"
+#~ msgstr "Ð?аÑ?Ñ?Ñ?"
+#~ msgid "Nepal"
+#~ msgstr "Ð?епал"
+#~ msgid "Netherlands"
+#~ msgstr "ХоландиÑ?а"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "ХоландÑ?ки Ð?нÑ?или"
+#~ msgid "New Caledonia"
+#~ msgstr "Ð?ова Ð?аледониÑ?а"
+#~ msgid "New Zealand"
+#~ msgstr "Ð?ови Ð?еланд"
+#~ msgid "Nicaragua"
+#~ msgstr "Ð?икаÑ?агва"
+#~ msgid "Niger"
+#~ msgstr "Ð?игеÑ?"
+#~ msgid "Nigeria"
+#~ msgstr "Ð?игеÑ?иÑ?а"
+#~ msgid "Niue"
+#~ msgstr "Ð?иÑ?"
+#~ msgid "Norfolk Island"
+#~ msgstr "Ð?оÑ?Ñ?олк Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Ð?Ñ?Ñ?Ñ?ва СевеÑ?на Ð?аÑ?иана"
+#~ msgid "Norway"
+#~ msgstr "Ð?оÑ?веÑ?ка"
+#~ msgid "Oman"
+#~ msgstr "Ð?ман"
+#~ msgid "Pakistan"
+#~ msgstr "Ð?акиÑ?Ñ?ан"
+#~ msgid "Palau"
+#~ msgstr "Ð?алаÑ?"
+#~ msgid "Palestinian Territory"
+#~ msgstr "Ð?алеÑ?Ñ?инÑ?ка ТеÑ?иÑ?оÑ?иÑ?а"
+#~ msgid "Panama"
+#~ msgstr "Ð?анама"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Ð?апÑ?а Ð?ова Ð?винеÑ?а"
+#~ msgid "Paraguay"
+#~ msgstr "Ð?аÑ?агваÑ?"
+#~ msgid "Peru"
+#~ msgstr "Ð?еÑ?Ñ?"
+#~ msgid "Philippines"
+#~ msgstr "Филипини"
+#~ msgid "Pitcairn"
+#~ msgstr "Ð?иÑ?кеÑ?н"
+#~ msgid "Poland"
+#~ msgstr "Ð?оÑ?Ñ?ка"
+#~ msgid "Portugal"
+#~ msgstr "Ð?оÑ?Ñ?Ñ?гал"
+#~ msgid "Puerto Rico"
+#~ msgstr "Ð?оÑ?Ñ?оÑ?ико"
+#~ msgid "Qatar"
+#~ msgstr "Ð?аÑ?аÑ?"
+
+# Ð?а овÑ? дÑ?жавÑ? ниÑ?ам Ñ?Ñ?о ни Ñ? Ñ?нÑ?, Ñ?ако да Ñ?ам оÑ?Ñ?авио Ñ? оÑ?игиналÑ?. -- Ð?а када Ñ?и необÑ?азован. :)
+#~ msgid "Reunion"
+#~ msgstr "РеÑ?нион"
+#~ msgid "Romania"
+#~ msgstr "РÑ?мÑ?ниÑ?а"
+#~ msgid "Russian Federation"
+#~ msgstr "РÑ?Ñ?ка ФедеÑ?аÑ?иÑ?а"
+#~ msgid "Rwanda"
+#~ msgstr "РÑ?анда"
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "СвеÑ?и Ð?иÑ?Ñ? и Ð?евиÑ?"
+#~ msgid "Saint Lucia"
+#~ msgstr "СвеÑ?а Ð?Ñ?Ñ?иÑ?а"
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "СвеÑ?и Ð?инÑ?енÑ? и Ð?Ñ?енадини"
+#~ msgid "Samoa"
+#~ msgstr "Самоа"
+#~ msgid "San Marino"
+#~ msgstr "Сан Ð?аÑ?ино"
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Сао Томе и Ð?Ñ?инÑ?ипе"
+#~ msgid "Saudi Arabia"
+#~ msgstr "СаÑ?диÑ?Ñ?ка Ð?Ñ?абиÑ?а"
+#~ msgid "Senegal"
+#~ msgstr "Сенегал"
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "СÑ?биÑ?а и ЦÑ?на Ð?оÑ?а"
+#~ msgid "Seychelles"
+#~ msgstr "СеÑ?Ñ?ели"
+#~ msgid "Sierra Leone"
+#~ msgstr "СиÑ?еÑ?а Ð?еоне"
+#~ msgid "Singapore"
+#~ msgstr "СингапÑ?Ñ?"
+#~ msgid "Slovakia"
+#~ msgstr "СловаÑ?ка"
+#~ msgid "Slovenia"
+#~ msgstr "СловениÑ?а"
+#~ msgid "Solomon Islands"
+#~ msgstr "СоломонÑ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Somalia"
+#~ msgstr "СомалиÑ?а"
+#~ msgid "South Africa"
+#~ msgstr "Ð?Ñ?жна Ð?Ñ?Ñ?ика"
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Ð?Ñ?жна Ð?оÑ?Ñ?иÑ?а и Ð?Ñ?жна СендвиÑ? Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Spain"
+#~ msgstr "ШпаниÑ?а"
+#~ msgid "Sri Lanka"
+#~ msgstr "ШÑ?и Ð?анка"
+#~ msgid "St. Helena"
+#~ msgstr "Св. Ð?елена"
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "Св. Ð?Ñ?еÑ? и Ð?икелон"
+#~ msgid "Sudan"
+#~ msgstr "СÑ?дан"
+#~ msgid "Suriname"
+#~ msgstr "СÑ?Ñ?инам"
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "СвалбаÑ?д и Ð?ан Ð?аÑ?ен Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Swaziland"
+#~ msgstr "Свазиленд"
+#~ msgid "Sweden"
+#~ msgstr "ШведÑ?ка"
+#~ msgid "Switzerland"
+#~ msgstr "ШваÑ?Ñ?аÑ?Ñ?ка"
+#~ msgid "Syria"
+#~ msgstr "СиÑ?иÑ?а"
+#~ msgid "Taiwan"
+#~ msgstr "ТаÑ?ван"
+#~ msgid "Tajikistan"
+#~ msgstr "ТаÑ?икиÑ?Ñ?ан"
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "ТанзаниÑ?а, УÑ?едиÑ?ена РепÑ?блика"
+#~ msgid "Thailand"
+#~ msgstr "ТаÑ?ланд"
+#~ msgid "Timor-Leste"
+#~ msgstr "ТимоÑ?-Ð?еÑ?Ñ?"
+#~ msgid "Togo"
+#~ msgstr "Того"
+#~ msgid "Tokelau"
+#~ msgstr "ТокелаÑ?"
+#~ msgid "Tonga"
+#~ msgstr "Тонга"
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "ТÑ?инидад и Тобаго"
+#~ msgid "Tunisia"
+#~ msgstr "ТÑ?ниÑ?"
+#~ msgid "Turkey"
+#~ msgstr "ТÑ?Ñ?Ñ?ка"
+#~ msgid "Turkmenistan"
+#~ msgstr "ТÑ?Ñ?кмениÑ?Ñ?ан"
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "ТÑ?Ñ?кÑ? и Ð?окоÑ? Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Tuvalu"
+#~ msgstr "ТÑ?валÑ?"
+#~ msgid "Uganda"
+#~ msgstr "Уганда"
+#~ msgid "Ukraine"
+#~ msgstr "УкÑ?аÑ?ина"
+#~ msgid "United Arab Emirates"
+#~ msgstr "УÑ?едиÑ?ени Ð?Ñ?апÑ?ки Ð?миÑ?аÑ?и"
+#~ msgid "United Kingdom"
+#~ msgstr "Ð?елика Ð?Ñ?иÑ?аниÑ?а"
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "РÑ?бна Ð?Ñ?Ñ?Ñ?ва СÐ?Ð?"
+#~ msgid "Uruguay"
+#~ msgstr "УÑ?Ñ?гваÑ?"
+#~ msgid "Uzbekistan"
+#~ msgstr "УзбекиÑ?Ñ?ан"
+#~ msgid "Vanuatu"
+#~ msgstr "Ð?анÑ?аÑ?Ñ?"
+#~ msgid "Venezuela"
+#~ msgstr "Ð?енеÑ?Ñ?ела"
+#~ msgid "Viet Nam"
+#~ msgstr "Ð?иÑ?еÑ?нам"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Ð?Ñ?иÑ?анÑ?ка Ð?евиÑ?анÑ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Ð?меÑ?иÑ?ка Ð?евиÑ?анÑ?ка Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Ð?олиÑ? и ФÑ?Ñ?Ñ?на Ð?Ñ?Ñ?Ñ?ва"
+#~ msgid "Western Sahara"
+#~ msgstr "Ð?ападна СаÑ?аÑ?а"
+#~ msgid "Yemen"
+#~ msgstr "Ð?емен"
+#~ msgid "Zambia"
+#~ msgstr "Ð?амбиÑ?а"
+#~ msgid "Zimbabwe"
+#~ msgstr "Ð?имбабве"
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL бÑ?зи глаÑ?ник"
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo глаÑ?ник"
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu'Gadu глаÑ?ник"
+#~ msgid "Service"
+#~ msgstr "СеÑ?виÑ?"
+#~ msgid "Username"
+#~ msgstr "Ð?оÑ?иÑ?ниÑ?ко име"
+#~ msgid "Address _2:"
+#~ msgstr "Ð?дÑ?еÑ?а _2:"
+#~ msgid "Ci_ty:"
+#~ msgstr "_Ð?Ñ?ад:"
+#~ msgid "Countr_y:"
+#~ msgstr "Ð?Ñ?жав_а:"
+#~ msgid "Full Address"
+#~ msgstr "Ð?Ñ?на адÑ?еÑ?а"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Ð?оÑ?Ñ?анÑ?ки бÑ?оÑ?:"
+#~ msgid "Dr."
+#~ msgstr "Ð?Ñ?"
+#~ msgid "Esq."
+#~ msgstr "Ð?оÑ?."
+#~ msgid "I"
+#~ msgstr "I"
+#~ msgid "II"
+#~ msgstr "II"
+#~ msgid "III"
+#~ msgstr "III"
+#~ msgid "Jr."
+#~ msgstr "Ð?л."
+#~ msgid "Miss"
+#~ msgstr "Ð?-Ñ?иÑ?а"
+#~ msgid "Mr."
+#~ msgstr "Ð?."
+#~ msgid "Mrs."
+#~ msgstr "Ð?-Ñ?а"
+#~ msgid "Ms."
+#~ msgstr "Ð?-Ñ?а"
+#~ msgid "Sr."
+#~ msgstr "СÑ?."
+#~ msgid "Add IM Account"
+#~ msgstr "Ð?одаÑ? налог бÑ?зог глаÑ?ника"
+#~ msgid "_Account name:"
+#~ msgstr "Ð?ме н_алога:"
+#~ msgid "_IM Service:"
+#~ msgstr "УÑ?лÑ?га _бÑ?зог глаÑ?ника:"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 п. ТаÑ?ома"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 п. ТаÑ?ома"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Ð?Ñ?азни обÑ?аÑ?Ñ?и на кÑ?аÑ?Ñ?:"
+#~ msgid "Body"
+#~ msgstr "Тело"
+#~ msgid "Bottom:"
+#~ msgstr "Ð?но:"
+#~ msgid "Dimensions:"
+#~ msgstr "Ð?имензиÑ?е:"
+#~ msgid "F_ont..."
+#~ msgstr "Ф_онÑ?..."
+#~ msgid "Fonts"
+#~ msgstr "Словни лик"
+#~ msgid "Footer:"
+#~ msgstr "Ð?одножÑ?е:"
+#~ msgid "Header/Footer"
+#~ msgstr "Ð?аглавÑ?е/подножÑ?е"
+#~ msgid "Headings"
+#~ msgstr "Ð?аглавÑ?а"
+#~ msgid "Headings for each letter"
+#~ msgstr "Ð?аглавÑ?а за Ñ?вако пиÑ?мо"
+#~ msgid "Height:"
+#~ msgstr "Ð?иÑ?ина:"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Ð?дмаÑ? пÑ?аÑ?и Ñ?едно дÑ?Ñ?го"
+#~ msgid "Include:"
+#~ msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е:"
+#~ msgid "Landscape"
+#~ msgstr "Ð?оложено"
+#~ msgid "Left:"
+#~ msgstr "Ð?ево:"
+#~ msgid "Letter tabs on side"
+#~ msgstr "Ð?езиÑ?Ñ?и Ñ?а Ñ?ловима Ñ?а Ñ?Ñ?Ñ?ане"
+#~ msgid "Margins"
+#~ msgstr "Ð?аÑ?гине"
+#~ msgid "Number of columns:"
+#~ msgstr "Ð?Ñ?оÑ? колона:"
+#~ msgid "Options"
+#~ msgstr "Ð?пÑ?иÑ?е"
+#~ msgid "Orientation"
+#~ msgstr "Ð?оложаÑ?"
+#~ msgid "Page"
+#~ msgstr "СÑ?Ñ?ана"
+#~ msgid "Page Setup:"
+#~ msgstr "Ð?одеÑ?аваÑ?е Ñ?Ñ?Ñ?ане:"
+#~ msgid "Paper"
+#~ msgstr "Ð?апиÑ?"
+#~ msgid "Paper source:"
+#~ msgstr "Ð?звоÑ? папиÑ?а:"
+#~ msgid "Portrait"
+#~ msgstr "УÑ?пÑ?авно"
+#~ msgid "Preview:"
+#~ msgstr "Ð?Ñ?еглед:"
+#~ msgid "Print using gray shading"
+#~ msgstr "ШÑ?ампаÑ? коÑ?иÑ?Ñ?еÑ?и Ñ?иве Ñ?онове"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Ð?бÑ?нÑ?Ñ?о на паÑ?ним Ñ?Ñ?Ñ?анама"
+#~ msgid "Right:"
+#~ msgstr "Ð?еÑ?но:"
+#~ msgid "Sections:"
+#~ msgstr "Ð?деÑ?Ñ?и:"
+#~ msgid "Start on a new page"
+#~ msgstr "Ð?оÑ?ни на новоÑ? Ñ?Ñ?Ñ?ани"
+#~ msgid "Style name:"
+#~ msgstr "Ð?ме Ñ?Ñ?ила:"
+#~ msgid "Top:"
+#~ msgstr "Ð?Ñ?Ñ?:"
+#~ msgid "Width:"
+#~ msgstr "ШиÑ?ина:"
+#~ msgid "_Font..."
+#~ msgstr "_Словни лик..."
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr ""
+#~ "Ð?али да Ñ?е коÑ?иÑ?Ñ?и леÑ?Ñ?е Ñ?аÑ?Ñ?наÑ?е вÑ?емена када Ñ?е пÑ?иказÑ?Ñ?Ñ? догаÑ?аÑ?и."
+#~ msgid "daylight savings time"
+#~ msgstr "Ð?еÑ?Ñ?е Ñ?аÑ?Ñ?наÑ?е вÑ?емена"
+#~ msgid "after"
+#~ msgstr "поÑ?ле"
+#~ msgid "day(s)"
+#~ msgstr "дан(и)"
+#~ msgid "end of appointment"
+#~ msgstr "кÑ?аÑ? Ñ?аÑ?Ñ?анка"
+#~ msgid "hour(s)"
+#~ msgstr "Ñ?аÑ?(и)"
+# bug: plural-forms
+#~ msgid "minute(s)"
+#~ msgstr "минÑ?Ñ?(и)"
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Ð?одеÑ?и за _леÑ?Ñ?е Ñ?аÑ?Ñ?наÑ?е вÑ?емена"
+#~ msgid "Attached message - %s"
+#~ msgstr "Ð?Ñ?иложена поÑ?Ñ?ка - %s"
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> пÑ?илог"
+#~ msgstr[1] "<b>%d</b> пÑ?илога"
+#~ msgstr[2] "<b>%d</b> пÑ?илога"
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "СакÑ?иÑ? линиÑ?Ñ? пÑ?и_лога"
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Ð?Ñ?икажи линиÑ?Ñ? п_Ñ?илога"
+#~ msgid "Show Attachments"
+#~ msgstr "Ð?Ñ?икажи п_Ñ?илоге"
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Ð?Ñ?иÑ?иÑ?ниÑ?е Ñ?азмак за пÑ?иказ(Ñ?акÑ?иваÑ?е) линиÑ?е пÑ?илога"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 дан пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 Ñ?аÑ? пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 минÑ?Ñ?а пÑ?е заказаног Ñ?аÑ?Ñ?анка"
+#~ msgid "for"
+#~ msgstr "за"
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>УÑ?еÑ?ни_Ñ?и</b>"
+#~ msgid "C_hange Organizer"
+#~ msgstr "_Ð?Ñ?омени оÑ?ганизаÑ?оÑ?а"
+#~ msgid "Co_ntacts..."
+#~ msgstr "Ð?онÑ?а_кÑ?и..."
+#~ msgid "forever"
+#~ msgstr "Ñ?век"
+#~ msgid "month(s)"
+#~ msgstr "меÑ?еÑ?(и)"
+#~ msgid "week(s)"
+#~ msgstr "недеÑ?а(е)"
+#~ msgid "year(s)"
+#~ msgstr "година(е)"
+#~ msgid "_Save Selected"
+#~ msgstr "_СаÑ?Ñ?ваÑ? изабÑ?ано"
+#~ msgid "April"
+#~ msgstr "Ð?пÑ?ил"
+#~ msgid "August"
+#~ msgstr "Ð?вгÑ?Ñ?Ñ?"
+#~ msgid "December"
+#~ msgstr "Ð?еÑ?ембаÑ?"
+#~ msgid "February"
+#~ msgstr "ФебÑ?Ñ?аÑ?"
+#~ msgid "January"
+#~ msgstr "Ð?анÑ?аÑ?"
+#~ msgid "July"
+#~ msgstr "Ð?Ñ?л"
+#~ msgid "June"
+#~ msgstr "Ð?Ñ?н"
+#~ msgid "March"
+#~ msgstr "Ð?аÑ?Ñ?"
+#~ msgid "May"
+#~ msgstr "Ð?аÑ?"
+#~ msgid "November"
+#~ msgstr "Ð?овембаÑ?"
+#~ msgid "October"
+#~ msgstr "Ð?кÑ?обаÑ?"
+#~ msgid "September"
+#~ msgstr "СепÑ?ембаÑ?"
+#~ msgid "Could not open autosave file"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и аÑ?Ñ?омаÑ?Ñ?ки Ñ?аÑ?Ñ?ванÑ? даÑ?оÑ?екÑ?"
+#~ msgid "_Post-To Field"
+#~ msgstr "_Ð?оÑ?аÑ?и поÑ?е"
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Ð?оÑ?аÑ?и пÑ?иказано"
+#~ msgid "_Subject Field"
+#~ msgstr "Ð?оÑ?е за _Ñ?емÑ?"
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Ð?иÑ?а да ли да пÑ?икаже поÑ?е за Ñ?емÑ?"
+#~ msgid "_To Field"
+#~ msgstr "_Ð?Ñ?има поÑ?е"
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Ð?иÑ?а да ли Ñ?е поÑ?е Ð?Ñ?има пÑ?иказано"
+#~ msgid "ago"
+#~ msgstr "пÑ?е"
+#~ msgid "months"
+#~ msgstr "меÑ?еÑ?и"
+#~ msgid "the current time"
+#~ msgstr "Ñ?Ñ?енÑ?Ñ?но вÑ?еме"
+#~ msgid "the time you specify"
+#~ msgstr "вÑ?еме коÑ?е одÑ?едиÑ?е"
+#~ msgid "years"
+#~ msgstr "године"
+#~ msgid "Retrieving Message..."
+#~ msgstr "Ð?овлаÑ?еÑ?е поÑ?Ñ?ке..."
+#~ msgid "C_all To..."
+#~ msgstr "Ð?_озив за..."
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "Ð?авÑ?Ñ?ено Ñ? %B %d, %Y, %l:%M %p"
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "до %B %d, %Y, %l:%M %p"
+#~ msgid "Save attachment as"
+#~ msgstr "СаÑ?Ñ?ваÑ? пÑ?илог као"
+#~ msgid "Select folder to save all attachments"
+#~ msgstr "Ð?забеÑ?иÑ?е Ñ?аÑ?Ñ?иклÑ? за Ñ?Ñ?ваÑ?е Ñ?виÑ? пÑ?илога"
+#~ msgid "_Save Selected..."
+#~ msgstr "Ð?забÑ?ано Ñ?Ñ?ваÑ?е..."
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d пÑ?и_лог"
+#~ msgstr[1] "%d пÑ?и_лога"
+#~ msgstr[2] "%d пÑ?и_логa"
+#~ msgid "S_ave"
+#~ msgstr "_СаÑ?Ñ?ваÑ?"
+#~ msgid "No Attachment"
+#~ msgstr "Ð?ема пÑ?илога"
+#~ msgid " (%a, %R %Z)"
+#~ msgstr "(%a, %R %Z)"
+#~ msgid " (%R %Z)"
+#~ msgstr "(%R %Z)"
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "УкÑ?Ñ?Ñ?и могÑ?Ñ?ноÑ?Ñ? пÑ?еÑ?Ñ?аге Ñ? боÑ?ноÑ? облаÑ?Ñ?и Ñ?ако да можеÑ?е покÑ?енÑ?Ñ?и "
+#~ "инÑ?еÑ?акÑ?ивнÑ? пÑ?еÑ?Ñ?агÑ? кÑ?Ñ?аÑ?Ñ?Ñ?и Ñ? поÑ?е за Ñ?екÑ?Ñ?. Ð?оÑ?иÑ?Ñ? Ñ?е да можеÑ?е лако "
+#~ "наÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ? Ñ?оÑ? боÑ?ноÑ? облаÑ?Ñ?и Ñ?амо кÑ?Ñ?аÑ?Ñ?Ñ?и име Ñ?аÑ?Ñ?икле и избоÑ? "
+#~ "Ñ?каÑ?е аÑ?Ñ?омаÑ?Ñ?ки на Ñ?Ñ? Ñ?аÑ?Ñ?иклÑ?."
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/невидÑ?ива копиÑ?а (Bcc) Ñ?е изабÑ?ана"
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/невидÑ?ива копиÑ?а (Bcc) Ñ?е изабÑ?ана."
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/копиÑ?а (Cc) Ñ?е изабÑ?ана"
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/копиÑ?а (Cc) Ñ?е изабÑ?ана."
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/Ñ?аÑ?е Ñ?е изабÑ?ана"
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/Ñ?аÑ?е Ñ?е изабÑ?ана."
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/пÑ?има Ñ?е изабÑ?ана"
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/поÑ?аÑ?и Ñ?е изабÑ?ана."
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/одговоÑ? Ñ?е изабÑ?ана"
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Ð?пÑ?иÑ?а Ð?Ñ?еглед/одговоÑ? Ñ?е изабÑ?ана."
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr " _Ð?Ñ?овеÑ?и подÑ?жане Ñ?ипове "
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "_Ð?Ñ?овеÑ?и подÑ?жане Ñ?ипове "
+#~ msgid "Do not quote"
+#~ msgstr "Ð?е Ñ?иÑ?иÑ?аÑ?"
+#~ msgid "Inline"
+#~ msgstr "УнÑ?Ñ?аÑ?"
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "УнÑ?Ñ?аÑ? (Outlook Ñ?Ñ?ил)"
+#~ msgid "Quoted"
+#~ msgstr "ЦиÑ?иÑ?ано"
+#~ msgid "S_OCKS Host:"
+#~ msgstr "Ð?омаÑ?ин за S_OCKS:"
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Ð?дабиÑ?а Ñ?аÑ?Ñ?иклÑ? Ð?Ñ?ипÑ?ема"
+#~ msgid "Select Sent Folder"
+#~ msgstr "Ð?дабиÑ?а Ñ?аÑ?Ñ?иклÑ? Ð?оÑ?лаÑ?о"
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "_Ð?Ñ?Ñ?омаÑ?Ñ?ко подеÑ?аваÑ?е поÑ?Ñ?едника:"
+#~ msgid "Case _sensitive"
+#~ msgstr "_Ð?Ñ?еÑ?Ñ?иво на велиÑ?инÑ? Ñ?лова"
+#~ msgid "F_ind:"
+#~ msgstr "Ð?Ñ?о_наÑ?и:"
+#~ msgid "Find in Message"
+#~ msgstr "Ð?Ñ?онаÑ?и Ñ? поÑ?Ñ?Ñ?и"
+#~ msgid "None Selected"
+#~ msgstr "Ð?иÑ?Ñ?а ниÑ?е изабÑ?ано"
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Ð?безбеÑ?Ñ?Ñ?е оÑ?новнÑ? Ñ?Ñ?нкÑ?ионалноÑ?Ñ? за локалне именике."
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "ТÑ?ага за пÑ?едмеÑ?има Ñ? коÑ?има Ñ?е може налазиÑ?и пÑ?илог Ñ? поÑ?Ñ?Ñ?и и Ñ?позоÑ?ава "
+#~ "Ñ?колико пÑ?илога нема"
+#, fuzzy
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "Ð?одаÑ?ак за обликоваÑ?е коÑ?и пÑ?иказÑ?Ñ?е звÑ?Ñ?не пÑ?илоге Ñ?нÑ?Ñ?аÑ? поÑ?Ñ?ке и "
+#~ "дозвоÑ?ава Ñ?иÑ?ово пÑ?Ñ?Ñ?аÑ?е диÑ?екÑ?но из еволÑ?Ñ?иÑ?е."
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr ""
+#~ "Ð?одаÑ?ак за изÑ?адÑ? Ñ?езеÑ?ве и опоÑ?авак подаÑ?ака и подеÑ?аваÑ?а Ð?волÑ?Ñ?иÑ?е."
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV извоÑ?и календаÑ?а"
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Ð?аÑ?е оÑ?новнÑ? Ñ?поÑ?Ñ?ебÑ? локалним календаÑ?има."
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP Ð?алендаÑ?и"
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "Ð?аÑ?е оÑ?новнÑ? Ñ?поÑ?Ñ?ебÑ? http календаÑ?има и оним на вебÑ?."
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Ð?аÑ?е оÑ?новнÑ? Ñ?поÑ?Ñ?ебÑ? календаÑ?има вÑ?емена."
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "Ð?Ñ?обни додаÑ?ак коÑ?и показÑ?Ñ?е иÑ?каÑ?Ñ?Ñ?и мени за Ñ?множаваÑ?е Ñ?Ñ?ваÑ?и Ñ? лиÑ?Ñ?Ñ? "
+#~ "иÑ?еÑ?ака."
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Ð?безбеÑ?Ñ?Ñ?е Ñ?Ñ?нкÑ?ионалноÑ?Ñ? за обележаваÑ?е неког календаÑ?а или именика као "
+#~ "подÑ?азÑ?меваног."
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "Ð?Ñ?икÑ?Ñ?Ñ?ак коÑ?и Ñ?Ñ?кÑ?Ñ?е збиÑ?ком наÑ?оÑ?иÑ?иÑ? Ñ?адÑ?и и Ñ?воÑ?Ñ?Ñ?ава над налозима за "
+#~ "Exchange."
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "СаÑ?Ñ?авиÑ?е поÑ?Ñ?ке коÑ?иÑ?Ñ?еÑ?ем дÑ?Ñ?гог Ñ?Ñ?еÑ?иваÑ?а"
+
+#, fuzzy
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "Ð?озвоÑ?ава одÑ?авÑ? Ñ?аÑ?Ñ?икли за поÑ?Ñ?Ñ? Ñ? мениÑ?Ñ? деÑ?ним кликом на Ñ?Ñ?абло "
+#~ "Ñ?аÑ?Ñ?икли."
+
+#, fuzzy
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за поÑ?Ñ?авÑ?аÑ?е календаÑ?а и конÑ?акаÑ?а за google."
+#~ msgid "Google sources"
+#~ msgstr "Ð?звоÑ?и Google"
+
+#, fuzzy
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "Ð?одаÑ?ак за намеÑ?Ñ?аÑ?е извоÑ?а гÑ?Ñ?пниÑ? календаÑ?а и именика."
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Ð?одаÑ?ак за намеÑ?Ñ?аÑ?е Ð¥Ñ?линиÑ? извоÑ?а календаÑ?а."
+#~ msgid "Hula Account Setup"
+#~ msgstr "Ð?одеÑ?аваÑ?е Ð¥Ñ?ла налога"
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Ð?одаÑ?ак за могÑ?Ñ?ноÑ?Ñ?и IMAP налога."
+#~ msgid "_Import to Calendar"
+#~ msgstr "Ð?звез_и Ñ? календаÑ?"
+#~ msgid "Import ICS"
+#~ msgstr "Увези Ð?нÑ?еÑ?неÑ? календаÑ?"
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "Увози ICS пÑ?илоге Ñ? календаÑ?."
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "УÑ?клаÑ?Ñ?Ñ?е изабÑ?ано задÑ?жеÑ?е/белеÑ?кÑ?/календаÑ?/адÑ?еÑ?аÑ? Ñ?а Ñ?епним Ñ?Ñ?еÑ?аÑ?ем "
+#~ "Apple iPod"
+#~ msgid "_Tasks :"
+#~ msgstr "Ð?а_дÑ?жеÑ?а:"
+#~ msgid "Memos :"
+#~ msgstr "Ð?елеÑ?ке :"
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Ð?озвоÑ?ава иÑ?кÑ?Ñ?Ñ?иваÑ?е налога."
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "СÑ?ваÑ?а D-Bus поÑ?Ñ?кÑ? или обавеÑ?Ñ?ава коÑ?иÑ?ника иконом Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони и "
+#~ "обавеÑ?Ñ?еÑ?ем када Ñ?Ñ?игне нова поÑ?Ñ?ка."
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr ""
+#~ "Ð?одаÑ?ак коÑ?и омогÑ?Ñ?ава пÑ?авÑ?еÑ?е Ñ?аÑ?Ñ?анака из Ñ?адÑ?жаÑ?а елекÑ?Ñ?онÑ?ке поÑ?Ñ?ке."
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "Ð?Ñ?оме_ни Ñ? Ñ?аÑ?Ñ?анак"
+#~ msgid "Mail to meeting"
+#~ msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? за Ñ?аÑ?Ñ?анак"
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "Ð?одаÑ?ак коÑ?и омогÑ?Ñ?ава пÑ?авÑ?еÑ?е задÑ?жеÑ?а из Ñ?адÑ?жаÑ?а елекÑ?Ñ?онÑ?ке поÑ?Ñ?ке."
+#~ msgid "Con_vert to Task"
+#~ msgstr "Ð?Ñ?о_мени Ñ? задÑ?жеÑ?е"
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?е за обележаваÑ?е Ñ?виÑ? поÑ?Ñ?ка Ñ? Ñ?аÑ?Ñ?икли да бÑ?дÑ? пÑ?оÑ?иÑ?ане"
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Ð?одаÑ?ак коÑ?и Ñ?води mono додаÑ?ке."
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "Ð?одаÑ?ак за Ñ?кÑ?Ñ?Ñ?иваÑ?е и иÑ?кÑ?Ñ?Ñ?иваÑ?е дÑ?Ñ?гиÑ? додаÑ?ака."
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "Ð?Ñ?обни додаÑ?ак коÑ?и показÑ?Ñ?е како додаÑ?ак за обликоваÑ?е омогÑ?Ñ?ава "
+#~ "иÑ?кÑ?Ñ?Ñ?иваÑ?е HTML поÑ?Ñ?е.\n"
+#~ "\n"
+#~ "Ð?ваÑ? додаÑ?ак Ñ?е Ñ?амо за поÑ?Ñ?ебе демонÑ?Ñ?Ñ?аÑ?иÑ?е.\n"
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "УпиÑ?Ñ?Ñ?е дневник иÑ?пиÑ?иваÑ?киÑ? догаÑ?аÑ?а."
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "Спам Ñ?биÑ?а (Ñ?гÑ?аÑ?ен)"
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "ФилÑ?Ñ?иÑ?а нежеÑ?енÑ? поÑ?Ñ?Ñ? коÑ?иÑ?Ñ?еÑ?и УбиÑ?Ñ? Ñ?пама. Ð?ваÑ? додаÑ?ак заÑ?Ñ?ева "
+#~ "Ñ?еговÑ? поновнÑ? инÑ?Ñ?алаÑ?иÑ?Ñ?."
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "Ð?одаÑ?ак за Ñ?Ñ?ваÑ?е Ñ?виÑ? пÑ?илога или делова поÑ?Ñ?ке одÑ?едном."
+#~ msgid "Save Attachments..."
+#~ msgstr "СаÑ?Ñ?ваÑ? пÑ?илоге..."
+#~ msgid "Save all attachments"
+#~ msgstr "СаÑ?Ñ?ваÑ? Ñ?ве пÑ?илоге"
+#~ msgid "Select save base name"
+#~ msgstr "Ð?забеÑ?и име за Ñ?нимаÑ?е базе"
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "Ð?бавеÑ?Ñ?ава ако низаÑ?е поÑ?Ñ?ка Ñ?Ñ?еба да Ñ?е вÑ?аÑ?и на наÑ?лов."
+
+#, fuzzy
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "Ð?едноÑ?Ñ?аван додаÑ?ак коÑ?и коÑ?иÑ?Ñ?и ytnef за декодиÑ?аÑ?е tnef пÑ?илога."
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "Ð?Ñ?икÑ?Ñ?Ñ?ак за поÑ?Ñ?авÑ?аÑ?е WebDAV конÑ?акаÑ?а."
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Ð?оÑ?аÑ?и но_вÑ? поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ?"
+#~ msgid "Post a Repl_y"
+#~ msgstr "Ð?оÑ?аÑ?и од_говоÑ?"
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?авнÑ? Ñ?аÑ?Ñ?иклÑ?"
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Ð?оÑ?аÑ?и одговоÑ? на поÑ?Ñ?кÑ? Ñ? Ñ?авнÑ? Ñ?аÑ?Ñ?иклÑ?"
+#~ msgid "Attachment Bar"
+#~ msgstr "Ð?иниÑ?а пÑ?илога"
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?илагаÑ?е даÑ?оÑ?еке %s: %s"
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?илагаÑ?е даÑ?оÑ?еке %s: ниÑ?е Ñ?егÑ?лаÑ?на даÑ?оÑ?ека"
+#~ msgid "MIME type:"
+#~ msgstr "MIME Ñ?ип:"
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Ð?Ñ?едложи аÑ?Ñ?омаÑ?Ñ?ки пÑ?иказ пÑ?илога"
+#~ msgid "Expanded"
+#~ msgstr "РазгÑ?анаÑ?о"
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "Ð?а ли Ñ?е Ñ?Ñ?абло Ñ?азгÑ?анаÑ?о или не"
+#~ msgid "Text of the expander's label"
+#~ msgstr "ТекÑ?Ñ? ознаке Ñ?Ñ?абла"
+#~ msgid "Use underline"
+#~ msgstr "Ð?оÑ?иÑ?Ñ?и подвлаÑ?еÑ?е"
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "Ð?ко Ñ?е поÑ?Ñ?авÑ?ено, подвлаÑ?еÑ?е Ñ? Ñ?екÑ?Ñ?Ñ? ознаÑ?ава знак коÑ?и Ñ?е Ñ?е коÑ?иÑ?Ñ?иÑ?и "
+#~ "као пÑ?еÑ?иÑ?а на Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?и"
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "Размак измеÑ?Ñ? ознаке и Ñ?адÑ?жаног елеменÑ?а"
+#~ msgid "Label widget"
+#~ msgstr "Ð?леменÑ? ознаке"
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "Ð?леменÑ? коÑ?и Ñ?е пÑ?иказÑ?Ñ?е Ñ?меÑ?Ñ?о обиÑ?не ознаке Ñ?Ñ?абла"
+#~ msgid "Indicator Spacing"
+#~ msgstr "Размак показиваÑ?а"
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Размак око Ñ?Ñ?Ñ?елиÑ?е Ñ?Ñ?абла"
+
+# bug: requires a comment on usage
+#~ msgid "Current Message"
+#~ msgstr "Ñ?екÑ?Ñ?оÑ? поÑ?Ñ?Ñ?и"
+#~ msgid "Edit Master Category List..."
+#~ msgstr "УÑ?еди Ð?иÑ?Ñ?Ñ? главниÑ? каÑ?егоÑ?иÑ?а..."
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Ð?Ñ?едмеÑ?(и) пÑ?ипада(Ñ?Ñ?) овим _каÑ?егоÑ?иÑ?ама:"
+#~ msgid "_Available Categories:"
+#~ msgstr "Ð?оÑ?Ñ?Ñ?пне _каÑ?егоÑ?иÑ?е:"
+#~ msgid "categories"
+#~ msgstr "каÑ?егоÑ?иÑ?е"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+# Ð?Ñ?евÑ?Ñ?и-и-Ð?Ñ?Ñ?Ñ?и
+#~ msgid "DnD code"
+#~ msgstr "Ð?иÐ? код"
+#~ msgid "Full Header"
+#~ msgstr "Ð?Ñ?но заглавÑ?е"
+#~ msgid "Font Description"
+#~ msgstr "Ð?пиÑ? Ñ?онÑ?а"
 #~ msgid "Novell Groupwise"
 #~ msgstr "Novell Groupwise"
-
 #~ msgid ""
 #~ "We were unable to open this address book.  This either means you have "
 #~ "entered an incorrect URI, or the LDAP server is unreachable."
 #~ msgstr ""
 #~ "Ð?Ñ?ваÑ?аÑ?е овог адÑ?еÑ?аÑ?а ниÑ?е могÑ?Ñ?е.  То знаÑ?и да Ñ?Ñ?е или Ñ?нели погÑ?еÑ?нÑ? "
 #~ "адÑ?еÑ?Ñ?, или Ñ?е LDAP Ñ?еÑ?веÑ? недоÑ?Ñ?Ñ?пан."
-
 #~ msgid "Contact Print Style Editor Test"
 #~ msgstr "Ð?Ñ?оба Ñ?Ñ?еÑ?иваÑ?а Ñ?Ñ?ила за Ñ?Ñ?ампаÑ?е конÑ?акÑ?а"
-
 #~ msgid "Copyright (C) 2000, Ximian, Inc."
 #~ msgstr "Ð?Ñ?Ñ?оÑ?Ñ?ко пÑ?аво (C) 2000, Ximian, Inc."
-
 #~ msgid "This should test the contact print style editor widget"
 #~ msgstr "Ð?во иÑ?пÑ?обава елеменÑ? Ñ?Ñ?еÑ?иваÑ?а Ñ?Ñ?ила за Ñ?Ñ?ампаÑ?е конÑ?акÑ?а"
-
 #~ msgid "Contact Print Test"
 #~ msgstr "Ð?Ñ?оба Ñ?Ñ?ампе конÑ?акÑ?а"
-
 #~ msgid "This should test the contact print code"
 #~ msgstr "Ð?во иÑ?пÑ?обава код за Ñ?Ñ?ампÑ? конÑ?акÑ?а"
-
 #~ msgid "Business"
 #~ msgstr "Ð?оÑ?ловно"
-
 #~ msgid "Competition"
 #~ msgstr "ТакмиÑ?еÑ?е"
-
 #~ msgid "Favourites"
 #~ msgstr "Ð?миÑ?ено"
-
 #~ msgid "Gifts"
 #~ msgstr "Ð?оклони"
-
 #~ msgid "Goals/Objectives"
 #~ msgstr "ЦиÑ?еви/задаÑ?и"
-
 #~ msgid "Holiday"
 #~ msgstr "Ð?Ñ?азник"
-
 #~ msgid "Holiday Cards"
 #~ msgstr "ЧеÑ?Ñ?иÑ?ке"
-
 #~ msgid "Hot Contacts"
 #~ msgstr "Ð?ажни конÑ?акÑ?и"
-
 #~ msgid "Ideas"
 #~ msgstr "Ð?деÑ?е"
-
 #~ msgid "International"
 #~ msgstr "Ð?еÑ?Ñ?наÑ?одно"
-
 #~ msgid "Key Customer"
 #~ msgstr "Ð?ажан клиÑ?енÑ?"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "Разно"
-
 #~ msgid "Next 7 days"
 #~ msgstr "СледеÑ?иÑ? 7 дана"
-
 #~ msgid "Phone Calls"
 #~ msgstr "ТелеÑ?онÑ?ки позиви"
-
 #~ msgid "Strategies"
 #~ msgstr "СÑ?Ñ?аÑ?егиÑ?е"
-
 #~ msgid "Suppliers"
 #~ msgstr "СнабдеваÑ?и"
-
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "Ð?Ñ?аÑ?еÑ?е Ñ? вÑ?еменÑ?; издаÑ?и"
-
 #~ msgid "VIP"
 #~ msgstr "Ð?Ð?Ð?"
-
 #~ msgid "Waiting"
 #~ msgstr "Чекам"
-
 #~ msgid "Next 7 Days"
 #~ msgstr "СледеÑ?иÑ? 7 дана"
-
 #~ msgid "A_dd Filter Criteria"
 #~ msgstr "Ð?о_даÑ? кÑ?иÑ?еÑ?иÑ?Ñ?м Ñ?илÑ?Ñ?иÑ?аÑ?а"
-
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "Ð?Ñ?еме: меÑ?Ñ?имиÑ?но облаÑ?но"
-
 #~ msgid "Please enter user name first."
 #~ msgstr "Ð?Ñ?во Ñ?неÑ?иÑ?е коÑ?иÑ?ниÑ?ко име."
-
 #~ msgid "Mark calendar offline"
 #~ msgstr "Ð?знаÑ?и календаÑ? за Ñ?ад ван мÑ?еже"
-
 #~ msgid "Marks the selected calendar for offline viewing."
 #~ msgstr "Ð?знаÑ?ава изабÑ?ан календаÑ? за пÑ?еглед ван мÑ?еже."
-
 #~ msgid "Error opening the FAQ webpage."
 #~ msgstr "Ð?Ñ?еÑ?ка пÑ?и оÑ?ваÑ?аÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?е за помоÑ?."
-
 #~ msgid "Select Importers"
 #~ msgstr "Ð?забеÑ?иÑ?е Ñ?вознике"
-
 #~ msgid "Re_fresh..."
 #~ msgstr "Ð?_Ñ?вежи..."
-
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
 #~ msgid "Permission Denied."
 #~ msgstr "Ð?абÑ?аÑ?ен пÑ?иÑ?Ñ?Ñ?п."
-
 #~ msgid "_Properties..."
 #~ msgstr "Ð?о_деÑ?аваÑ?а..."
-
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Ð?Ñ?иказ</b>"
-
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Ð?одаÑ?и Ñ?еÑ?веÑ?а</b>"
-
 #~ msgid "_Categories..."
 #~ msgstr "Ð?а_Ñ?егоÑ?иÑ?е..."
-
 #~ msgid "\n"
 #~ msgstr "\n"
-
 #~ msgid "Add an email to the List"
 #~ msgstr "Ð?одаÑ? е-поÑ?Ñ?Ñ? на лиÑ?Ñ?Ñ?"
-
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "УмеÑ?ниÑ?е елекÑ?Ñ?онÑ?ке адÑ?еÑ?е из именика"
-
 #~ msgid "Members"
 #~ msgstr "Чланови"
-
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Уклони елекÑ?Ñ?онÑ?кÑ? адÑ?еÑ?Ñ? Ñ?а лиÑ?Ñ?е"
-
 #~ msgid "_Select"
 #~ msgstr "_Ð?забеÑ?и"
-
 #~ msgid "D_escription:"
 #~ msgstr "_Ð?пиÑ?:"
-
 #~ msgid "De_scription:"
 #~ msgstr "Ð?_пиÑ?:"
-
 #~ msgid "Or_ganiser:"
 #~ msgstr "Ð?Ñ?_ганизаÑ?оÑ?:"
-
 #~ msgid "Task sort"
 #~ msgstr "РазвÑ?Ñ?Ñ?аваÑ?е задÑ?жеÑ?а"
-
 #~ msgid "Memo sort"
 #~ msgstr "РазвÑ?Ñ?Ñ?аваÑ?е белеÑ?ки"
-
 #~ msgid "Updating query"
 #~ msgstr "Ð?Ñ?вежаваÑ?е Ñ?пиÑ?а"
-
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Ð?аÑ?Ñ?Ñ?паÑ?Ñ?Ñ?и Ñ?аÑ?Ñ?анÑ?и"
-
 #~ msgid "SMTWTFS"
 #~ msgstr "Ð?Ð?УСЧÐ?С"
-
 #~ msgid "Post To:"
 #~ msgstr "СлаÑ?е на:"
-
 #~ msgid "Unknown reason"
 #~ msgstr "Ð?епознаÑ? Ñ?азлог"
-
 #~ msgid "Open File"
 #~ msgstr "Ð?Ñ?ваÑ?а даÑ?оÑ?екÑ?"
-
 #~ msgid "_Save Message"
 #~ msgstr "СаÑ?_Ñ?ваÑ? поÑ?Ñ?кÑ?"
-
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "Ð?оÑ?ловни и пÑ?огÑ?ам за е-поÑ?Ñ?Ñ? â?? Ð?волÑ?Ñ?иÑ?а"
-
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е даÑ?оÑ?еке &quot;{0}&quot;."
-
 #~ msgid "_Search name:"
 #~ msgstr "Ð?Ñ?нова за _пÑ?еÑ?Ñ?агÑ?:"
-
 #~ msgid "Di_sable"
 #~ msgstr "Ð?_Ñ?кÑ?Ñ?Ñ?и"
-
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
-
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "Ð?вÑ?Ñ?на даÑ?оÑ?ека за обавеÑ?Ñ?еÑ?е о новоÑ? поÑ?Ñ?и"
-
 #~ msgid "New Mail Notify type"
 #~ msgstr "Тип обавеÑ?Ñ?еÑ?а о новоÑ? поÑ?Ñ?и"
-
 #~ msgid "Specifies the type of New Mail Notification the user wishes to use."
 #~ msgstr "Ð?аводи Ñ?ип обавеÑ?Ñ?еÑ?а о новоÑ? поÑ?Ñ?и коÑ?е коÑ?иÑ?ник жели да коÑ?иÑ?Ñ?и."
-
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">Ð?знаке и боÑ?е</span>"
-
 #~ msgid "<span weight=\"bold\">New Mail Notification</span>"
 #~ msgstr "<span weight=\"bold\">Ð?бавеÑ?Ñ?аваÑ?е о новоÑ? поÑ?Ñ?и</span>"
-
 #~ msgid "Attach original message"
 #~ msgstr "Ð?Ñ?иложи оÑ?игиналнÑ? поÑ?Ñ?кÑ?"
-
 #~ msgid "Do not quote original message"
 #~ msgstr "Ð?е Ñ?иÑ?иÑ?аÑ? оÑ?игиналнÑ? поÑ?Ñ?кÑ?"
-
 #~ msgid "HTML Mail"
 #~ msgstr "HTML поÑ?Ñ?а"
-
 #~ msgid "Quote original message"
 #~ msgstr "ЦиÑ?иÑ?аÑ? оÑ?игиналнÑ? поÑ?Ñ?кÑ?"
-
 #~ msgid "Se_lect..."
 #~ msgstr "Ð?за_беÑ?и..."
-
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "С_виÑ?ни када Ñ?Ñ?игне нова поÑ?Ñ?а"
-
 #~ msgid "_Do not notify me when new mail arrives"
 #~ msgstr "_Ð?емоÑ? да ме обавеÑ?Ñ?аваÑ? када Ñ?Ñ?игне нова поÑ?Ñ?а"
-
 #~ msgid "Enter a name for this signature."
 #~ msgstr "УнеÑ?иÑ?е име за оваÑ? поÑ?пиÑ?."
-
 #~ msgid "Name:"
 #~ msgstr "Ð?ме:"
-
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "СигÑ?Ñ?но желиÑ?е Ñ?Ñ?аÑ?но да Ñ?клониÑ?е Ñ?ве обÑ?иÑ?ане поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?икли &quot;{0}"
 #~ "&quot;?"
-
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "Ð?бÑ?иÑ?аÑ?и &quot;{0}&quot;?"
-
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Ð?а ли желиÑ?е да овÑ? Ñ?адÑ?Ñ? Ñ?акоÑ?е пÑ?имениÑ?е на Ñ?ве подÑ?аÑ?Ñ?икле?"
-
 # bug: requires a comment on usage
 #~ msgid "Only on _Current Folder"
 #~ msgstr "Само на _Ñ?екÑ?Ñ?оÑ? Ñ?аÑ?Ñ?икли"
-
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "УкÑ?Ñ?Ñ?Ñ?Ñ?е додаÑ?ак за подÑ?еÑ?ник за пÑ?илоге"
-
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "СвоÑ?Ñ?Ñ?ва подÑ?еÑ?ника за пÑ?илоге"
-
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Ð?одÑ?еÑ?и за _недоÑ?Ñ?аÑ?Ñ?Ñ?е пÑ?илоге"
-
 #~ msgid "_Refresh:"
 #~ msgstr "Ð?_Ñ?вежи:"
-
 # Ð?еÑ?аÑ?но. "ЧемÑ? ово Ñ?лÑ?жи, а Ñ?з Ñ?о и не Ñ?ади?".
 # http://bugzilla.gnome.org/show_bug.cgi?id=458512
 #, fuzzy
 #~ msgid "button-user"
 #~ msgstr "дÑ?гме-коÑ?иÑ?ник"
-
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "Ð?забеÑ?иÑ?е (48*48) png велиÑ?ине < 720баÑ?Ñ?а"
-
 #~ msgid "_Contacts..."
 #~ msgstr "_Ð?онÑ?акÑ?и..."
-
 #~ msgid "Every time a new mail arrives, pop up a libnotify notification."
 #~ msgstr ""
 #~ "Сваки пÑ?Ñ? када Ñ?Ñ?игне нова поÑ?Ñ?а, пÑ?икажи пÑ?озоÑ?Ñ?е Ñ?а libnotify "
 #~ "обавеÑ?Ñ?еÑ?ем."
-
 #~ msgid "Make the status icon blink"
 #~ msgstr "Чини да икона Ñ?Ñ?аÑ?Ñ?Ñ?а Ñ?Ñ?епÑ?е"
-
 #~ msgid "When the new-mail status icon is visible, make it blink."
 #~ msgstr "Ð?ада Ñ?е икона за новÑ? поÑ?Ñ?Ñ? видÑ?ива, нека Ñ?Ñ?епÑ?е."
-
 #~ msgid "System error: %s"
 #~ msgstr "СиÑ?Ñ?емÑ?ка гÑ?еÑ?ка: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Ð?алог не може да Ñ?аÑ?е поÑ?Ñ?Ñ?"
-
 #~ msgid "No store available"
 #~ msgstr "Ð?ема доÑ?Ñ?Ñ?пне оÑ?Ñ?аве"
-
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
 #~ msgstr "Ð?одаÑ?ак коÑ?и Ñ?води CORBA Ñ?Ñ?Ñ?еÑ?е за мÑ?ежно пÑ?иÑ?Ñ?Ñ?паÑ?е поÑ?Ñ?и."
-
 #~ msgid "Mail Remote"
 #~ msgstr "Ð?Ñ?ежна поÑ?Ñ?а"
-
 #~ msgid "New Mail Notification"
 #~ msgstr "Ð?бавеÑ?Ñ?еÑ?е о новоÑ? поÑ?Ñ?и"
-
 #~ msgid "Configure"
 #~ msgstr "Ð?одеÑ?ава"
-
 #~ msgid "Gives an option to print mail from composer"
 #~ msgstr "Ð?аÑ?е могÑ?Ñ?ноÑ?Ñ? Ñ?Ñ?ампе поÑ?Ñ?ке из Ñ?аÑ?Ñ?авÑ?аÑ?а"
-
 #~ msgid "Print Message"
 #~ msgstr "ШÑ?ампаÑ? поÑ?Ñ?кÑ?"
-
 #~ msgid "Prints the message"
 #~ msgstr "ШÑ?ампа поÑ?Ñ?кÑ?"
-
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "Ð?одаÑ?ак коÑ?и Ñ?Ñ?кÑ?Ñ?е Ñ?водним Ñ?аÑ?обÑ?аком"
-
 #~ msgid "Startup wizard"
 #~ msgstr "ЧаÑ?обÑ?ак за поÑ?еÑ?ак"
-
 #~ msgid "A string description of the current printer settings"
 #~ msgstr "Ð?пиÑ?ни низ Ñ?Ñ?енÑ?Ñ?ниÑ? подеÑ?аваÑ?а Ñ?Ñ?ампаÑ?а"
-
 #~ msgid "No folder name specified."
 #~ msgstr "Ð?иÑ?е наведено име Ñ?аÑ?Ñ?икле."
-
 #~ msgid "Folder name cannot contain the Return character."
 #~ msgstr "Ð?ме Ñ?аÑ?Ñ?икле не може да Ñ?адÑ?жи Return знак."
-
 #~ msgid "Folder name cannot contain the character \"/\"."
 #~ msgstr "Ð?ме Ñ?аÑ?Ñ?икле не може да Ñ?адÑ?жи знак â??/â??."
-
 #~ msgid "Folder name cannot contain the character \"#\"."
 #~ msgstr "Ð?ме Ñ?аÑ?Ñ?икле не може да Ñ?адÑ?жи знак â??#â??."
-
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "â??.â?? и â??..â?? Ñ?Ñ? заÑ?зеÑ?и за имена Ñ?аÑ?Ñ?икли."
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Умножи изабÑ?ано Ñ? Ñ?пиÑ?ак иÑ?еÑ?ака"
-
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "СеÑ?е изабÑ?ано Ñ? Ñ?пиÑ?ак иÑ?еÑ?ака"
-
 #~ msgid "Paste from clipboard"
 #~ msgstr "УбаÑ?и Ñ?а Ñ?пиÑ?ка иÑ?еÑ?ака"
-
 #~ msgid "All Day Event"
 #~ msgstr "Целодневни догаÑ?аÑ?"
-
 #~ msgid "Send _Options"
 #~ msgstr "_Ð?пÑ?иÑ?е Ñ?лаÑ?а"
-
 #~ msgid "Download messages for offline"
 #~ msgstr "Ð?Ñ?еÑ?зима поÑ?Ñ?ке за Ñ?ад ван мÑ?еже"
-
 #~ msgid "Show messages in the normal style"
 #~ msgstr "Ð?Ñ?икажи поÑ?Ñ?кÑ? Ñ? ноÑ?малном Ñ?Ñ?илÑ?"
-
 #~ msgid "Delete all but signature"
 #~ msgstr "Ð?Ñ?иÑ?е Ñ?ве оÑ?им поÑ?пиÑ?а"
-
 #~ msgid "For_mat"
 #~ msgstr "_Ð?блик"
-
 #~ msgid "HT_ML"
 #~ msgstr "HT_ML"
-
 #~ msgid "Open a file"
 #~ msgstr "Ð?Ñ?воÑ?и даÑ?оÑ?екÑ?"
-
 #~ msgid "PGP Encrypt"
 #~ msgstr "PGP Ñ?иÑ?Ñ?Ñ?Ñ?"
-
 #~ msgid "PGP Sign"
 #~ msgstr "PGP поÑ?пиÑ?"
-
 #~ msgid "S/MIME Encrypt"
 #~ msgstr "S/MIME Ñ?иÑ?Ñ?Ñ?Ñ?"
-
 #~ msgid "S/MIME Sign"
 #~ msgstr "S/MIME поÑ?пиÑ?"
-
 #~ msgid "Save in folder..."
 #~ msgstr "СаÑ?Ñ?ваÑ? Ñ? Ñ?аÑ?Ñ?иклÑ?..."
-
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "СаÑ?Ñ?ваÑ? поÑ?Ñ?кÑ? Ñ? наведеноÑ? Ñ?аÑ?Ñ?икли"
-
 #~ msgid "Send"
 #~ msgstr "Ð?оÑ?аÑ?и"
-
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Ð?оÑ?аÑ?и поÑ?Ñ?кÑ? Ñ? HTML Ñ?оÑ?маÑ?Ñ?"
-
 #~ msgid "_Delete all"
 #~ msgstr "Ð?бÑ?и_Ñ?и Ñ?ве"
-
 #~ msgid "_Open..."
 #~ msgstr "_Ð?Ñ?воÑ?и..."
-
 #~ msgid "C_lose"
 #~ msgstr "_Ð?аÑ?воÑ?и"
-
 #~ msgid "H_TML"
 #~ msgstr "H_TML"
-
 #~ msgid "Save and _Close"
 #~ msgstr "СаÑ?Ñ?ваÑ? и _заÑ?воÑ?и"
-
 #~ msgid "Save the current file and close the window"
 #~ msgstr "СаÑ?Ñ?ваÑ? Ñ?екÑ?Ñ?Ñ? даÑ?оÑ?екÑ? и заÑ?воÑ?и пÑ?озоÑ?"
-
 #~ msgid "Refresh List"
 #~ msgstr "Ð?Ñ?вежи Ñ?пиÑ?ак"
-
 #~ msgid "Refresh List of Folders"
 #~ msgstr "Ð?Ñ?вежи Ñ?пиÑ?ак Ñ?аÑ?Ñ?икли"
-
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Уклони Ñ?аÑ?Ñ?иклÑ? Ñ?а Ñ?пиÑ?ка пÑ?иÑ?авÑ?ениÑ? Ñ?аÑ?Ñ?икли"
-
 #~ msgid "Subscribe"
 #~ msgstr "Ð?Ñ?иÑ?ави Ñ?е"
-
 #~ msgid "Unsubscribe"
 #~ msgstr "Ð?дÑ?ави Ñ?е"
-
 #~ msgid "_Invert Selection"
 #~ msgstr "_Ð?бÑ?ни избоÑ?"
-
 #~ msgid "Status Details"
 #~ msgstr "Ð?еÑ?аÑ?и Ñ?Ñ?аÑ?а"
-
 #~ msgid "Time Zone"
 #~ msgstr "Ð?Ñ?еменÑ?ка зона"
-
 #~ msgid "TimeZone Combobox"
 #~ msgstr "Ð?квиÑ? за вÑ?еменÑ?кÑ? зонÑ?"
 
-# week, 'M' for 'Monday', 'T' for Tuesday etc.
-#~ msgid "MTWTFSS"
-#~ msgstr "Ð?УСЧÐ?СÐ?"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- _Уклони"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "Ð?Ñ?и_кажи ова поÑ?а Ñ?едом:"
-
-#~ msgid "_Add ->"
-#~ msgstr "_Ð?одаÑ? ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "Ð?понаÑ?аÑ? пÑ?оменÑ? велиÑ?ине ознаке"
-
-#~ msgid "A Folder with this name already exists"
-#~ msgstr "Ð?една Ñ?аÑ?Ñ?икла Ñ?а Ñ?им именом веÑ? поÑ?Ñ?оÑ?и"
-
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "Ð?Ñ?омеÑ?ена елекÑ?Ñ?онÑ?ка адÑ?еÑ?а или име овог конÑ?акÑ?а\n"
-#~ "веÑ? поÑ?Ñ?оÑ?и Ñ? овоÑ? Ñ?аÑ?Ñ?икли.  Ð?елиÑ?е ли ипак да додаÑ?е?"
-
-#~ msgid ""
-#~ "All information in these journal entries will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "Сви подаÑ?и Ñ? овим Ñ?ноÑ?има Ñ? дневник Ñ?е биÑ?и обÑ?иÑ?ани и неÑ?е Ñ?е моÑ?и "
-#~ "повÑ?аÑ?иÑ?и."
-
-#~ msgid ""
-#~ "All information on this journal entry will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "Сви подаÑ?и о овом Ñ?ноÑ?Ñ? Ñ? дневник Ñ?е биÑ?и обÑ?иÑ?ани и неÑ?е Ñ?е моÑ?и "
-#~ "повÑ?аÑ?иÑ?и."
-
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е Ñ?ноÑ? Ñ? дневник â??{0}â???"
-
-# bug: plural-forms
-#~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е ове {0} Ñ?ноÑ?е Ñ? дневник?"
-
-#~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "СигÑ?Ñ?но желиÑ?е да обÑ?иÑ?еÑ?е оваÑ? Ñ?ноÑ? Ñ? дневник?"
-
-#~ msgid ""
-#~ "If you do not send a cancelation notice, the other participants may not "
-#~ "know the journal has been deleted."
-#~ msgstr ""
-#~ "Уколико не поÑ?аÑ?еÑ?е обавеÑ?Ñ?еÑ?е о оÑ?казиваÑ?Ñ?, оÑ?Ñ?али Ñ?Ñ?еÑ?ниÑ?и можда неÑ?е "
-#~ "знаÑ?и да Ñ?е дневник обÑ?иÑ?ан."
-
-#~ msgid "This journal entry has been deleted."
-#~ msgstr "Ð?ваÑ? Ñ?ноÑ? Ñ? дневник Ñ?е обÑ?иÑ?ан."
-
-#~ msgid "This journal entry has been changed."
-#~ msgstr "Ð?ваÑ? Ñ?ноÑ? Ñ? дневник Ñ?е пÑ?омеÑ?ен."
-
-#~ msgid "The journal entry could not be deleted due to a corba error"
-#~ msgstr "УноÑ? Ñ? дневник ниÑ?е могао биÑ?и обÑ?иÑ?ан због corba гÑ?еÑ?ке"
-
-#~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr "УноÑ? Ñ? дневник ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?еÑ? пÑ?иÑ?Ñ?Ñ?п ниÑ?е дозвоÑ?ен"
-
-#~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr "УноÑ? Ñ? дневник ниÑ?е могао биÑ?и обÑ?иÑ?ан Ñ?Ñ?лед гÑ?еÑ?ке"
-
-# повÑ?аÑ?ни > Ñ?едовни
-#~ msgid ""
-#~ "You are modifying a recurring journal entry. What would you like to "
-#~ "modify?"
-#~ msgstr "Ð?еÑ?аÑ?е повÑ?аÑ?ни Ñ?ноÑ? Ñ? дневник, Ñ?Ñ?а желиÑ?е да измениÑ?е?"
-
-#~ msgid "<b>Then</b>"
-#~ msgstr "<b>Ð?нда</b>"
-
-#~ msgid "Valid signature, cannot verify sender"
-#~ msgstr "Ð?Ñ?пÑ?аван поÑ?пиÑ?, ниÑ?е могÑ?Ñ?а пÑ?овеÑ?а поÑ?иÑ?аоÑ?а"
-
-#~ msgid "Mark as _Read"
-#~ msgstr "Ð?_знаÑ?и као пÑ?оÑ?иÑ?ано"
-
-#~ msgid "_Do not Mark as Read"
-#~ msgstr "Ð?Ñ?_Ñ?ави непÑ?оÑ?иÑ?ано"
-
-#~ msgid "Check Evolution archive"
-#~ msgstr "Ð?Ñ?овеÑ?ава аÑ?Ñ?ивÑ? Ð?волÑ?Ñ?иÑ?е"
-
-#~ msgid "<b>Junk Mail Settings</b>"
-#~ msgstr "<b>Ð?одеÑ?аваÑ?а поÑ?Ñ?е за Ñ?Ñ?бÑ?е</b>"
-
-#~ msgid "<b>Subject</b> :"
-#~ msgstr "<b>Ð?аÑ?лов</b>"
-
-#~ msgid "<b>From</b> :"
-#~ msgstr "<b>ШаÑ?е</b>"
-
-#~ msgid "Unable to find this journal entry in any journal"
-#~ msgstr "Ð?е могÑ? да пÑ?онаÑ?ем оваÑ? Ñ?ноÑ? Ñ? ниÑ?едном дневникÑ?"
-
-#~ msgid "_Address: "
-#~ msgstr "_Ð?дÑ?еÑ?а:"
-
-#~ msgid "Print cards"
-#~ msgstr "ШÑ?ампаÑ? каÑ?Ñ?е"
-
-#~ msgid "Organization"
-#~ msgstr "Ð?Ñ?ганизаÑ?иÑ?а"
-
-#~ msgid "E-mail"
-#~ msgstr "Ð?-поÑ?Ñ?а"
-
-#~ msgid "GTK Tree View"
-#~ msgstr "Ð?Ñ?еглед GTK Ñ?Ñ?абла"
-
-#~ msgid "Print envelope"
-#~ msgstr "ШÑ?ампаÑ? ковеÑ?Ñ?Ñ?"
-
-#~ msgid "Print contacts"
-#~ msgstr "ШÑ?ампаÑ? конÑ?акÑ?е"
-
-#~ msgid "Print contact"
-#~ msgstr "ШÑ?ампаÑ? конÑ?акÑ?"
-
-#~ msgid "Error loading default addressbook."
-#~ msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?иÑ?аваÑ?Ñ? подÑ?азÑ?меваног именика."
-
-#~ msgid "Input File"
-#~ msgstr "Улазна даÑ?оÑ?ека"
-
-#~ msgid "Add Calendar"
-#~ msgstr "Ð?одаÑ?е календаÑ?"
-
-#~ msgid "Add Task List"
-#~ msgstr "Ð?одаÑ?е лиÑ?Ñ?Ñ? задÑ?жеÑ?а"
-
-#~ msgid "_Add Calendar"
-#~ msgstr "_Ð?одаÑ? календаÑ?"
-
-#~ msgid "_Add Task List"
-#~ msgstr "_Ð?одаÑ? лиÑ?Ñ?Ñ? задÑ?жеÑ?а"
-
-#~ msgid "Add New Calendar"
-#~ msgstr "Ð?одаÑ? нови календаÑ?"
-
-#~ msgid "Calendar Group"
-#~ msgstr "Ð?Ñ?Ñ?па календаÑ?а"
-
-#~ msgid "Calendar Location"
-#~ msgstr "Ð?еÑ?Ñ?о календаÑ?а"
-
-#~ msgid "Calendar Name"
-#~ msgstr "Ð?ме календаÑ?а"
-
-#~ msgid "<b>Task List Options</b>"
-#~ msgstr "<b>Ð?пÑ?иÑ?е лиÑ?Ñ?е задÑ?жеÑ?а</b>"
-
-#~ msgid "Add New Task List"
-#~ msgstr "Ð?одаÑ? новÑ? лиÑ?Ñ?Ñ? задÑ?жеÑ?а"
-
-#~ msgid "Task List Group"
-#~ msgstr "Ð?Ñ?Ñ?па за лиÑ?Ñ?е задÑ?жеÑ?а"
-
-#~ msgid "Task List Name"
-#~ msgstr "Ð?ме лиÑ?Ñ?е задÑ?жеÑ?а"
-
-#~ msgid "<b>Free/Busy C_alendars</b>"
-#~ msgstr "<b>Ð?_алендаÑ?и за Ñ?лободно/заÑ?зеÑ?о</b>"
-
-#~ msgid "<b>Publishing Frequency</b>"
-#~ msgstr "<b>УÑ?еÑ?Ñ?алоÑ?Ñ? обÑ?авÑ?иваÑ?а</b>"
-
-#~ msgid "<b>Publishing _Location</b>"
-#~ msgstr "<b>_Ð?еÑ?Ñ?о обÑ?авÑ?иваÑ?а</b>"
-
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "Ð?одеÑ?аваÑ?а обÑ?авÑ?иваÑ?а Ñ?лободно/заÑ?зеÑ?о"
-
-#~ msgid "_Daily"
-#~ msgstr "_Ð?невно"
-
-#~ msgid "_Manual"
-#~ msgstr "_РÑ?Ñ?но"
-
-#~ msgid "_Weekly"
-#~ msgstr "_Ð?едеÑ?но"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "УнеÑ?иÑ?е лозинкÑ? за %s"
-
-#~ msgid "Selected day (%a %b %d %Y)"
-#~ msgstr "Ð?забÑ?ани дан (%a, %d. %b %Y.)"
-
-#~ msgid "%a %b %d"
-#~ msgstr "%a, %d. %b"
-
-#~ msgid "%a %d %Y"
-#~ msgstr "%a, %d. %Y."
-
-#~ msgid "%a %b %d %Y"
-#~ msgstr "%a, %d. %b %Y."
-
-#~ msgid "Selected week (%s - %s)"
-#~ msgstr "Ð?забÑ?ана недеÑ?а (%s - %s)"
-
-#~ msgid "Selected month (%b %Y)"
-#~ msgstr "Ð?забÑ?ани меÑ?еÑ? (%b %Y)"
-
-#~ msgid "Selected year (%Y)"
-#~ msgstr "Ð?забÑ?ана година (%Y)"
-
-#~ msgid "Print Item"
-#~ msgstr "ШÑ?ампаÑ? пÑ?едмеÑ?"
-
-#~ msgid "%.0fK"
-#~ msgstr "%.0fK"
-
-#~ msgid "%.0fM"
-#~ msgstr "%.0fM"
-
-#~ msgid "%.0fG"
-#~ msgstr "%.0fG"
-
-#~ msgid "No, Do not Change Status"
-#~ msgstr "Ð?е, не меÑ?аÑ? Ñ?Ñ?аÑ?е"
-
-#~ msgid "<b>Receiving Email</b>"
-#~ msgstr "<b>Ð?Ñ?имаÑ?е поÑ?Ñ?е</b>"
-
-#~ msgid "<b>Sending Email:</b>"
-#~ msgstr "<b>СлаÑ?е поÑ?Ñ?е:</b>"
-
-#~ msgid ""
-#~ "<small>This page allows you to choose if you want to be notified via a "
-#~ "read receipt when a message you\n"
-#~ "sent is read, and to specify what Evolution should do when someone "
-#~ "requests a receipt from you.</small>"
-#~ msgstr ""
-#~ "<small>Ð?ва Ñ?Ñ?Ñ?ана дозвоÑ?ава да изабеÑ?еÑ?е да ли желиÑ?е да поÑ?аÑ?еÑ?е "
-#~ "пÑ?изнаниÑ?Ñ? Ñ?з Ñ?воÑ?Ñ?\n"
-#~ "поÑ?Ñ?кÑ? Ñ?ади обавеÑ?Ñ?еÑ?а када бÑ?де пÑ?оÑ?иÑ?ана, и да одÑ?едиÑ?е Ñ?Ñ?а Ð?волÑ?Ñ?иÑ?а "
-#~ "да Ñ?ади када неко Ð?ама поÑ?аÑ?е пÑ?изнаниÑ?Ñ?.</small>"
-
-#~ msgid "Ask me if I want to send back a read receipt"
-#~ msgstr "Ð?иÑ?аÑ? ме желим ли да вÑ?аÑ?им пÑ?изнаниÑ?Ñ?"
-
-#~ msgid "Never send back a read receipt"
-#~ msgstr "Ð?икада не вÑ?аÑ?аÑ? пÑ?изнаниÑ?Ñ?"
-
-#~ msgid "Read Receipts"
-#~ msgstr "Ð?Ñ?изнаниÑ?е"
-
-#~ msgid "Request a read receipt for all messages I send"
-#~ msgstr "Ð?аÑ?Ñ?ажи повÑ?аÑ?аÑ? пÑ?изнаниÑ?е за Ñ?ве поÑ?Ñ?ке коÑ?е поÑ?аÑ?ем"
-
-#~ msgid ""
-#~ "Unless the message is sent to a mailing list, and not to me personally"
-#~ msgstr "Ð?Ñ?им ако Ñ?е поÑ?Ñ?ка поÑ?лаÑ?а допиÑ?ноÑ? лиÑ?Ñ?и, а не мени лиÑ?но"
-
-#~ msgid ""
-#~ "When you receive an email with a read receipt request, what should "
-#~ "Evolution do?"
-#~ msgstr "Ð?ада пÑ?имиÑ?е поÑ?Ñ?кÑ? Ñ?а пÑ?изнаниÑ?ом, Ñ?Ñ?а Ð?волÑ?Ñ?иÑ?а да Ñ?ади?"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Ð?оложаÑ? зоне."
-
-#~ msgid "Enable"
-#~ msgstr "Ð?могÑ?Ñ?и"
-
-#~ msgid "Priority Filter \"%s\""
-#~ msgstr "ФилÑ?еÑ? важноÑ?Ñ?и â??%sâ??"
-
-#~ msgid ""
-#~ "Some of your Netscape email filters are based on\n"
-#~ "email priorities, which are not used in Evolution.\n"
-#~ "Instead, Evolution provides scores in the range of\n"
-#~ "-3 to 3 that can be assigned to emails and filtered\n"
-#~ "accordingly.\n"
-#~ "\n"
-#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
-#~ "was added that converts Netscape's email priorities into\n"
-#~ "Evolution's scores, and the affected filters use scores instead\n"
-#~ "of priorities. Check the imported filters to make sure\n"
-#~ "everything still works as intended."
-#~ msgstr ""
-#~ "Ð?еки од Netscape Ñ?илÑ?еÑ?а за поÑ?Ñ?Ñ? заÑ?новани Ñ?Ñ?\n"
-#~ "на пÑ?иоÑ?иÑ?еÑ?има коÑ?е Ð?волÑ?Ñ?иÑ?а не коÑ?иÑ?Ñ?и.\n"
-#~ "УмеÑ?Ñ?о Ñ?ога Ð?волÑ?Ñ?иÑ?а даÑ?е Ñ?езÑ?лÑ?аÑ?е Ñ? Ñ?аÑ?понÑ? од\n"
-#~ "-3 до 3 коÑ?и Ñ?е додеÑ?Ñ?Ñ?Ñ? поÑ?Ñ?кама и Ñ? Ñ?кладÑ? Ñ?а Ñ?име\n"
-#~ "Ñ?илÑ?Ñ?иÑ?аÑ?Ñ?.\n"
-#~ "\n"
-#~ "Ð?ао пÑ?ивÑ?емено Ñ?еÑ?еÑ?е, додаÑ?а Ñ?е гÑ?Ñ?па Ñ?илÑ?еÑ?а имена \n"
-#~ "â??Ð?Ñ?иоÑ?иÑ?еÑ?ни Ñ?илÑ?еÑ?â?? коÑ?а пÑ?еÑ?ваÑ?а Netscape Ñ?илÑ?еÑ?е за поÑ?Ñ?Ñ? Ñ?\n"
-#~ "Ñ?езÑ?лÑ?аÑ?е Ð?волÑ?Ñ?иÑ?е, а пÑ?омеÑ?ени Ñ?илÑ?еÑ?и коÑ?иÑ?Ñ?е Ñ?езÑ?лÑ?аÑ?е Ñ?меÑ?Ñ?о\n"
-#~ "пÑ?иоÑ?иÑ?еÑ?а. Ð?Ñ?овеÑ?иÑ?е Ñ?вежене Ñ?илÑ?еÑ?е да Ñ?е Ñ?веÑ?иÑ?е\n"
-#~ "да ли Ñ?ве Ñ?ади као Ñ?Ñ?о би Ñ?Ñ?ебало."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters use\n"
-#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
-#~ "feature, which is not supported in Evolution.\n"
-#~ "These filters will be dropped."
-#~ msgstr ""
-#~ "Ð?еки од Netscape Ñ?илÑ?еÑ?а за поÑ?Ñ?Ñ? коÑ?иÑ?Ñ?е\n"
-#~ "могÑ?Ñ?ноÑ?Ñ? â??Ð?анемаÑ?и Ñ?аÑ?пÑ?авÑ?â?? или â??Ð?Ñ?аÑ?и Ñ?аÑ?пÑ?авÑ?â??\n"
-#~ "коÑ?Ñ? Ð?волÑ?Ñ?иÑ?а не подÑ?жава.\n"
-#~ "Ð?ви Ñ?илÑ?еÑ?и Ñ?е биÑ?и изоÑ?Ñ?авÑ?ени."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters test the\n"
-#~ "body of emails for (in)equality to a given string,\n"
-#~ "which is not supported in Evolution. Those filters\n"
-#~ "were modified to test whether that string is or is not\n"
-#~ "contained in the message body."
-#~ msgstr ""
-#~ "Ð?еки од Netscape Ñ?илÑ?еÑ?а за поÑ?Ñ?Ñ? пÑ?овеÑ?аваÑ?Ñ?\n"
-#~ "да ли Ñ? Ñ?елÑ? поÑ?Ñ?ка поÑ?Ñ?оÑ?и (не)Ñ?еднакоÑ?Ñ? за даÑ?и низ,\n"
-#~ "Ñ?Ñ?о Ð?волÑ?Ñ?иÑ?а не подÑ?жава. Ð?ви Ñ?илÑ?еÑ?и\n"
-#~ "Ñ?Ñ? пÑ?омеÑ?ени да пÑ?овеÑ?аваÑ?Ñ? да ли Ñ?аÑ? низ Ñ?еÑ?Ñ?е\n"
-#~ "или ниÑ?е Ñ?адÑ?жан Ñ? Ñ?елÑ? поÑ?Ñ?ке."
-
-#~ msgid "Evolution is importing your old Netscape data"
-#~ msgstr "Ð?волÑ?Ñ?иÑ?а Ñ?вози Ñ?Ñ?аÑ?е Netscape подаÑ?ке"
-
-#~ msgid "Importing Netscape data"
-#~ msgstr "УвожеÑ?е Netscape подаÑ?ака"
-
-#~ msgid "Settings"
-#~ msgstr "Ð?одеÑ?аваÑ?а"
-
-#~ msgid "Mail Filters"
-#~ msgstr "ФилÑ?еÑ?и поÑ?Ñ?е"
-
-#~ msgid ""
-#~ "Evolution has found Netscape mail files.\n"
-#~ "Would you like them to be imported into Evolution?"
-#~ msgstr ""
-#~ "Ð?волÑ?Ñ?иÑ?а Ñ?е пÑ?онаÑ?ла Netscape даÑ?оÑ?еке поÑ?Ñ?е.\n"
-#~ "Ð?елиÑ?е ли да бÑ?дÑ? Ñ?вежене Ñ? Ð?волÑ?Ñ?иÑ?Ñ??"
-
-#~ msgid "<span weight=\"bold\">Filter Options</span>"
-#~ msgstr "<span weight=\"bold\">Ð?огÑ?Ñ?ноÑ?Ñ?и Ñ?илÑ?еÑ?а</span>"
-
-#~ msgid "<b>Recipients </b>"
-#~ msgstr "<b>Ð?Ñ?имаоÑ?и</b>"
-
-#~ msgid "<b>Action</b>"
-#~ msgstr "<b>РадÑ?а</b>"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Ð?аÑ?Ñ?м и вÑ?еме</b>"
-
-#~ msgid ""
-#~ "The output directory was not found on iPod! Please ensure that iPod has "
-#~ "been correctly set up and try again."
-#~ msgstr ""
-#~ "Ð?злазна Ñ?аÑ?Ñ?икла ниÑ?е пÑ?онаÑ?ена на iPod Ñ?Ñ?еÑ?аÑ?Ñ?! Ð?олим пÑ?овеÑ?иÑ?е да ли Ñ?е "
-#~ "Ñ?епни Ñ?Ñ?еÑ?аÑ? пÑ?авилно подеÑ?ен и покÑ?Ñ?аÑ?Ñ?е поново."
-
-#~ msgid "Could not export data!"
-#~ msgstr "Ð?иÑ?е могÑ?Ñ? извоз подаÑ?ака!"
-
-#~ msgid "Exporting data failed."
-#~ msgstr "Ð?еÑ?Ñ?пеÑ?ан извоз подаÑ?ака."
-
-#~ msgid "Could not open addressbook!"
-#~ msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и именик!"
-
-#~ msgid "Could not open the Evolution addressbook to export data."
-#~ msgstr "Ð?е могÑ? да оÑ?воÑ?им Ð?волÑ?Ñ?иÑ?ин именик како би извезао подаÑ?ке."
-
-#~ msgid "Could not open calendar/todo!"
-#~ msgstr "Ð?е могÑ? оÑ?воÑ?иÑ?и календаÑ?/Ñ?пиÑ?ак обавеза"
-
-#~ msgid "Could not open the Evolution calendar/todo list to export data."
-#~ msgstr ""
-#~ "Ð?е могÑ? оÑ?воÑ?иÑ?и Ð?волÑ?Ñ?иÑ?ин календаÑ?/Ñ?пиÑ?ак за Ñ?Ñ?адиÑ?и да би извезао "
-#~ "подаÑ?ке."
-
-#~ msgid "New mail notify"
-#~ msgstr "Ð?бавеÑ?Ñ?еÑ?е о новоÑ? поÑ?Ñ?и"
-
-#~ msgid "(Untitled)"
-#~ msgstr "(Ð?еименовано)"
-
-#~ msgid "An attachment to add."
-#~ msgstr "Ð?Ñ?илог за додаваÑ?е."
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "Тип Ñ?адÑ?жаÑ?а пÑ?илога."
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "Ð?ме даÑ?оÑ?еке коÑ?е Ñ?е пÑ?иказÑ?Ñ?е Ñ? поÑ?Ñ?Ñ?и."
-
-#~ msgid "Description of the attachment."
-#~ msgstr "Ð?пиÑ? пÑ?илога."
-
-#~ msgid "Mark attachment to be shown inline by default."
-#~ msgstr "Ð?знаÑ?и да Ñ?е пÑ?илог подÑ?азÑ?мевано пÑ?иказÑ?Ñ?е Ñ?нÑ?Ñ?аÑ? поÑ?Ñ?ке."
-
-#~ msgid "_Edit..."
-#~ msgstr "_УÑ?еди..."
-
-#~ msgid "..."
-#~ msgstr "..."
diff --git a/po/sr latin po b/po/sr latin po
index 08ec2b9..b26facf 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -6,21 +6,18 @@
 # Maintainer: Igor NestoroviÄ? <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by Igor NestoroviÄ? <igor prevod org>
 #
-#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2009-04-09 10:59+0000\n"
-"PO-Revision-Date: 2008-09-19 21:31+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
+"POT-Creation-Date: 2009-08-28 13:23+0000\n"
+"PO-Revision-Date: 2009-08-31 10:56+0100\n"
 "Last-Translator: Igor NestoroviÄ? <igor prevod org>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # note(slobo): message thread, niz --> bolji prevod je rasprava
 # note(slobo): ponegde sam za summary koristio --> â??u kratkim crtamaâ??
@@ -32,27 +29,27 @@ msgstr ""
 # note(slobo): spam , Ä?ubre --> Neželjena poÅ¡ta
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
-msgstr "evolucijin adresar"
+msgstr "Adresar Evolucije"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Novi kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "trenutna fascikla imenika %s ima %d kartu"
-msgstr[1] "trenutna fascikla imenika %s ima %d karte"
-msgstr[2] "trenutna fascikla imenika %s ima %d karti"
+msgstr[0] "trenutna fascikla adresara %s ima %d kartu"
+msgstr[1] "trenutna fascikla adresara %s ima %d karte"
+msgstr[2] "trenutna fascikla adresara %s ima %d karti"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -70,38 +67,38 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "minikarta evolucije"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Ima alarme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Ima ponavljanja."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "To je sastanak."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Kalendarski dogaÄ?aj: pregled je %s."
+msgstr "Kalendarski dogaÄ?aj: sažetak je %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
-msgstr "Kalendarski dogaÄ?aj: nema pregled."
+msgstr "Kalendarski dogaÄ?aj: nema sažetka."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "dogaÄ?aj pregleda kalendara"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Uhvati fokus"
 
 #: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
-msgstr "Novi zakazani sastanak"
+msgstr "Novo zakazivanje"
 
 #: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
@@ -119,14 +116,15 @@ msgstr "Idi na današnji dan"
 msgid "Go to Date"
 msgstr "Idi na datum"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "tabela za prikaz i izbor tekuÄ?eg vremenskog raspona"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
+#: ../a11y/calendar/ea-day-view.c:148
+#: ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -136,7 +134,8 @@ msgstr[2] "Ima %d dogaÄ?aja."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
+#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Nema dogaÄ?aja."
 
@@ -165,7 +164,7 @@ msgid "calendar view for one or more days"
 msgstr "pregled kalendara za jedan ili više dana"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -181,18 +180,19 @@ msgstr "%A, %d. %b %Y."
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844
+#: ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -200,10 +200,10 @@ msgstr "%a %d %b %Y."
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -217,31 +217,32 @@ msgstr "%d. %b %Y."
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
-msgstr "linija pretrage"
+msgstr "traka pretrage"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
-msgstr "linija pretrage evolucija kalendara"
+msgstr "traka pretrage kalendara evolucije"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "Dugme za preskakanje"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Kliknite ovde, možete naÄ?i joÅ¡ dogaÄ?aja."
 
@@ -272,20 +273,20 @@ msgstr "iskaÄ?uÄ?e"
 msgid "popup a child"
 msgstr "iskaÄ?uÄ?e izvedeno"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "ureÄ?ivanje"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
-msgstr "poÄ?inje ureÄ?ivanjem ove Ä?elije"
+msgstr "poÄ?ni ureÄ?ivanjem ove Ä?elije"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "biranje"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "biranje Ä?elije"
 
@@ -305,17 +306,17 @@ msgstr "skuplja"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "skuplja red u ETree gde se Ä?elija nalazi"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "Ä?elija tabele"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "kliknite da dodate"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "klik"
 
@@ -335,7 +336,7 @@ msgstr "Kalendar: od %s do %s"
 
 #: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
-msgstr "predmet evolucija kalendara"
+msgstr "stavka kalendara evolucije"
 
 #: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
@@ -343,36 +344,20 @@ msgstr "Dugme za kombinovanje"
 
 #: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
-msgstr "Aktiviraj podrazumevano"
+msgstr "Aktivira podrazumevano"
 
 #: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "IskaÄ?uÄ?i meni"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Prikaz linije priloga"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "aktivirati"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"Adresar â??{0}â?? je samo za Ä?itanjeje i nije podložan izmenama. Izaberite drugi "
-"adresar sa boÄ?ne trake u pogledu Kontakti."
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgstr "Adresar â??{0}â?? je samo za Ä?itanje i nije podložan izmenama. Izaberite drugi adresar sa boÄ?ne trake u pregledu Kontakti."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Kontakt sa ovom adresom veÄ? postoji. Želite li ipak da dodate novu kartu sa "
-"istom adresom?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "Kontakt sa ovom adresom veÄ? postoji. Želite li ipak da dodate novu kartu sa istom adresom?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -391,14 +376,8 @@ msgid "Category editor not available."
 msgstr "UreÄ?ivaÄ? kategorija nije dostupan."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Proverite da je lozinka ispravno uneta i da koristite podržani naÄ?in "
-"prijave. Ne zaboravite da je veliÄ?ina slova bitna u lozinkama; možda su "
-"velika slova ukljuÄ?ena."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Proverite da li je lozinka ispravno uneta i da li koristite podržani naÄ?in prijave. Ne zaboravite da je veliÄ?ina slova bitna u lozinkama; možda su velika slova ukljuÄ?ena."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -409,18 +388,16 @@ msgid "Could not remove address book."
 msgstr "Nije moguÄ?e ukloniti adresar."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
-msgstr ""
-"Trenutno iz Evolucije možete pristupiti samo sistemskom adresaru GroupWise. "
-"Koristite neki drugi GroupWise program za elektronsku poštu kako bi mogli "
-"dobiti GroupWise Ä?este kontakte i fascikle sa liÄ?nim kontaktima."
+#| msgid ""
+#| "Currently you can access only GroupWise System Address Book from "
+#| "Evolution. Please use some other GroupWise mail client once, to get your "
+#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "Trenutno iz Evolucije možete pristupiti samo sistemskom adresaru GroupWise. Koristite neki drugi GroupWise klijent za elektronsku poÅ¡tu kako bi dobili GroupWise Ä?este kontakte i fascikle sa liÄ?nim kontaktima."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "Obrisati imenik â??{0}â???"
+msgstr "Obrisati adresar â??{0}â???"
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading address book."
@@ -436,13 +413,13 @@ msgstr "Neuspela autentifikacija na LDAP server."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Neuspelo brisanje kontakta"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "Pravljenje GroupWise imenika"
+msgstr "Pravljenje GroupWise adresara:"
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
@@ -462,21 +439,12 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolucijin adresar je neoÄ?ekivano prestao da radi."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Slika koju ste izabrali je prevelika. Da li želite da joj promenite veliÄ?inu "
-"i saÄ?uvate?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Slika koju ste izabrali je prevelika. Želite li da joj promenite veliÄ?inu i saÄ?uvate?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Ovaj LDAP server možda koristi stariju verziju LDAP-a koja ne podržava ovu "
-"moguÄ?nost, ili je loÅ¡e podeÅ¡en. Pitajte administratora za podržane osnove za "
-"pretragu."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "Ovaj LDAP server možda koristi stariju verziju LDAP-a koja ne podržava ovu moguÄ?nost, ili je loÅ¡e podeÅ¡en. Pitajte administratora za podržane osnove za pretragu."
 
 # malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:24
@@ -488,17 +456,13 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "Server ovog adresara ne sadrži predložene osnove za pretragu."
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Server ovog adresara je ili nedostupan ili je njegovo ime pogrešno uneto ili "
-"je mreža nedostupna."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "Server ovog adresara je ili nedostupan ili je njegovo ime pogrešno uneto ili je mreža nedostupna."
 
 # malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
-msgstr "Ovaj imenik Ä?e biti trajno uklonjen."
+msgstr "Ovaj adresar Ä?e biti trajno uklonjen."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
@@ -521,39 +485,27 @@ msgid "Would you like to save your changes?"
 msgstr "Želite li da saÄ?uvate promene?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Pokušavate da premestite kontakt iz jednog adresara u drugi ali se on ne "
-"može ukloniti iz izvora. Želite li da saÄ?uvate umnožak umesto toga?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "PokuÅ¡avate da premestite kontakt iz jednog adresara u drugi ali se on ne može ukloniti iz izvora. Želite li da saÄ?uvate umnožak umesto toga?"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"Povezujete se na nepodržan GroupWise server što može da dovede do problema u "
-"radu Evolucije. Najbolje je da server bude nadograÄ?en na podržanu verziju"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "Povezujete se na nepodržan GroupWise server Å¡to može da dovede do problema u radu Evolucije. Najbolje je da server bude nadograÄ?en na podržanu verziju"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemate dovoljna ovlaÅ¡Ä?enja da briÅ¡ete kontakte iz ovog adresara."
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "Izmenili ste ovaj kontakt. Želite li da saÄ?uvate ove promene?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"VaÅ¡i kontakti za {0} neÄ?e biti dostupni dok se Evolucija ponovo ne pokrene."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Kontakti za {0} neÄ?e biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -578,7 +530,8 @@ msgstr "_Koristi tako kako je"
 
 # bug: we don't want this translated
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../mail/mail.error.xml.h:143
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
@@ -589,105 +542,101 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za usklaÄ?ivanje:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "Nije moguÄ?e uÄ?itati adresar"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Nije moguÄ?e Ä?itanje programskog bloka adresa pilota"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "Samodopunjavanje"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontakti"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Sertifikati"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Podesite samodopunjavanje ovde"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#| msgid "Configure autocomplete here"
+msgid "Configure contacts and autocompletion here"
+msgstr "Podesite kontakte i samodopunjavanje ovde"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193
+#: ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
-msgstr "Evolucijin imenik"
+msgstr "Adresar Evolucije"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "ProzorÄ?e za adrese Evolucijinog adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
-msgstr "PregledaÄ? adresa Evolucijinog imenika"
+msgstr "PregledaÄ? adresa Evolucijinog adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
-msgstr "PregledaÄ? karti Evolucijinog imenika"
+msgstr "PregledaÄ? karti Evolucijinog adresara"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
-msgstr "Deo Evolucije â?? Imenik"
+msgstr "Deo Adresara Evolucije"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Kontrola upravljanja S/MIME sertifikatima Evolucije"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
-msgstr "Kontrola podešavanja fascikli Evolucije"
+msgstr "Kontrola postavki fascikli Evolucije"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Upravljajte S/MIME sertifikatima ovde"
 
 # On This Computer is always first and VFolders is always last
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151
+#: ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576
+#: ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148
+#: ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193
+#: ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320
+#: ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Na ovom raÄ?unaru"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Na LDAP serverima"
+
 # Create the default Person calendar
 # Create the default Person task list
 # orange
@@ -702,166 +651,186 @@ msgstr "Na ovom raÄ?unaru"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189
+#: ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484
+#: ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098
+#: ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190
+#: ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "LiÄ?no"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "Na LDAP serverima"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Napravi novi kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt li_sta"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Napravi novu kontakt listu"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
-msgstr "Novi imenik"
+msgstr "Novi adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
-msgstr "Napravi novi imenik"
+msgstr "Napravi novi adresar"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "Neuspela nadogradnja podešavanja imenika ili njegovih fascikli."
+msgstr "Neuspela nadogradnja posatvki adresara ili njegovih fascikli."
+
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo ako on podržava SSL Å¡ifrovanje."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo ako on podržava TLS Å¡ifrovanje."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "Odabir ove moguÄ?nosti znaÄ?i da server ne podržava ni SSL ni TLS Å¡ifrovanje. To znaÄ?i da VaÅ¡a veza neÄ?e biti sigurna i da Ä?ete biti ranjivi na sigurnosne napade. "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Baza"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "Umnoži sadržaj _knjige lokalno za rad van mreže"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "Ovo je port LDAP servera na koji Ä?e Evolucija pokuÅ¡ati da se poveže. PonuÄ?en je spisak standardnih portova. Pitajte administratora sistema koji port da navedete."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "Evolucija Ä?e koristiti ovaj metod za autentifikaciju.  Primetite da njegovo ukljuÄ?ivanje na â??Elektronska adresaâ?? zahteva anonimni pristup na LDAP server."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "Obim pretrage definiÅ¡e dubinu kojom želite da pretraga obuhvati stablo direktorijuma. Obim pretrage â??podâ?? Ä?e ukljuÄ?iti sve unose ispod baze za pretragu. Obim pretrage â??jedanâ?? Ä?e ukljuÄ?iti samo unose jedan nivo ispod VaÅ¡e baze."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283
+#: ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Opšte"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
-msgstr "Imenik"
+msgstr "Adresar"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Autentifikacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalji"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Pretraživanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
-msgstr "Podešavanja imenika"
+msgstr "Postavke adresara"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148
+#: ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Prenošenje..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195
+#: ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "PrenoÅ¡enje â??%sâ??:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
-msgstr "Podešavanja samodopunjavanja"
+msgstr "Postavke samodopunjavanja"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Putanja i hijerarhija fascikli za kontakte u Evoluciji je izmenjena od "
-"Evolucije 1.x.\n"
+"Putanja i hijerarhija fascikli za kontakte u Evoluciji izmenjena je od Evolucije 1.x.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Oblik za kontakte dopisnih lista je izmenjen.\n"
+"Format za kontakte dopisnih lista je izmenjen.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -871,7 +840,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -882,55 +851,63 @@ msgstr ""
 "Budite strpljivi dok Evolucija prenosi podatke sa Pilot Sync ureÄ?aja..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj fasciklu â??%sâ?? u:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Preimenuj fasciklu"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Imena fascikli ne mogu da sadrže â??/â??"
 
 #: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
-msgstr "_Novi imenik"
+msgstr "_Novi adresar"
 
 #: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Ä?uva kao vKartu..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479
+#: ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122
+#: ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482
+#: ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-list.xml.h:35
+#: ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Obriši"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487
+#: ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "O_sobine"
 
@@ -943,20 +920,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupanje LDAP serveru"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Neuspela autentifikacija.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Unesite lozinku"
@@ -974,28 +951,20 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML za listu adresa za dopunjavanje."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Položaj uspravne povrÅ¡i, izmeÄ?u karte i liste pregleda i panela za pregled, "
-"u pikselima."
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "Položaj uspravne povrÅ¡i, izmeÄ?u karte i spiska pregleda i panela za pregled, u pikselima."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
-msgstr ""
+msgstr "Prikazuje samodopunjeno ime sa adresom"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Prikaži površ za pregled"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Broj znakova koji se moraju ukucati pre nego što Evolucija pokuša da "
-"samodopuni."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "Broj znakova koji se moraju ukucati pre nego što Evolucija pokuša da samodopuni."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
@@ -1006,25 +975,38 @@ 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."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "Položaj uspravne površi"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr "Da li da u unosu obavezno prikaže adresu e-pošte sa imenom samodopunjenog kontakta."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Da li se prikazuje površ za pregled."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Samodopunjavanje"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
-msgstr ""
+msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
+
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#| msgid "Date/Time"
+msgid "Date/Time Format"
+msgstr "Format datum/vreme"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#| msgid "Table model"
+msgid "Table column:"
+msgstr "Kolona tabele:"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "Potraži u adresarima"
 
@@ -1033,21 +1015,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentifikacija</b>"
@@ -1060,280 +1040,145 @@ msgstr "<b>Preuzimanje</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>Pretraživanje</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Tip:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "Dodaj imenik"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Uvek"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Anonimno"
+#| msgid "Using distinguished name (DN)"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Anonimno\n"
+"KoriÅ¡Ä?enje adrese e-poÅ¡te\n"
+"KoriÅ¡Ä?enje posebnog imena (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "Pre_gleda ovaj adresar dok se ne dostigne limit"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Osnovno"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolucija Ä?e koristiti ovu elektronsku adresu da Vas autentifikuje na server."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Posebno ime"
+msgid "Lo_gin:"
+msgstr "Pri_java:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "Elektronska adresa"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#| msgid "One"
 msgid ""
-"Evolution will use this email address to authenticate you with the server."
+"One\n"
+"Sub"
 msgstr ""
-"Evolucija Ä?e koristiti ovu elektronsku adresu da Vas autentifikuje na server."
+"Jedan\n"
+"Pod"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "NaÄ?i moguÄ?e osnove za pretragu"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "Pri_java:"
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL Å¡ifrovanje\n"
+"TLS Å¡ifrovanje\n"
+"Bez Å¡ifrovanja"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "Nikada"
+msgid "Search Filter"
+msgstr "Propusnik pretrage"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "Ne koristi se Å¡ifrovanje"
+msgid "Search _base:"
+msgstr "Osnova za _pretragu:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Jedan"
+msgid "Search _filter:"
+msgstr "P_ropusnik pretrage:"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL Å¡ifrovanje"
+#| msgid ""
+#| "Search filter is the type of the objects searched for, while performing "
+#| "the search. If this is not modified, by  default search will be performed "
+#| "on objectclass of the type \"person\"."
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgstr "Filter pretrage je vrsta objekta za kojim se traga. Ako se ovo ne izmeni, podrazumevana pretraga Ä?e biti obavljena na vrsti â??osobaâ??."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "Propusnik pretrage"
+msgid "Supported Search Bases"
+msgstr "Podržane baze za pretragu"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "Osnova za _pretragu:"
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "Baza za pretragu je posebno ime (DN) unosa odakle Ä?e VaÅ¡a pretraga poÄ?eti. Ako ovo ostavite prazno, pretraga Ä?e poÄ?eti iz korena stabla direktorijuma."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "P_ropusnik pretrage:"
+msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
+msgstr "Ovo je puno ime VaÅ¡eg ldap servera. Na primer, â??ldap.mojepreduzece.comâ??."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Propusnik pretrage"
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "Ovo je najveÄ?i broj unosa za preuzimanje. Ako unesete suviÅ¡e veliki broj usporiÄ?ete adresar."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"Propusnik pretrage je vrsta objekta koji se pretražuje. Ako se ovo ne izmeni "
-"podrazumevana pretraga Ä?e biti obavljena na klasi objekta â??osobaâ??."
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "Ovo je ime servera koje Ä?e se pojaviti u listi fascikli Evolucije. To je samo za potrebe prikazivanja. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo "
-"ako on podržava SSL šifrovanje."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo "
-"ako on podržava TLS šifrovanje."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Odabir ove moguÄ?nosti znaÄ?i da server ne podržava ni SSL ni TLS Å¡ifrovanje. "
-"To znaÄ?i da VaÅ¡a veza neÄ?e biti sigurna, i da Ä?ete biti ranjivi na sigurnosne "
-"napade. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Pod"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "Podržane baze za pretragu"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS Å¡ifrovanje"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"Baza za pretragu je posebno ime (DN) unosa odakle Ä?e VaÅ¡a pretraga poÄ?eti. "
-"Ako ovo ostavite prazno, pretraga Ä?e poÄ?eti iz korena stabla direktorijuma."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo "
-"direktorijuma. Obim pretrage â??podâ?? Ä?e ukljuÄ?iti sve unose ispod baze za "
-"pretragu. Obim pretrage â??jedanâ?? Ä?e ukljuÄ?iti samo unose jedan nivo ispod VaÅ¡e "
-"baze."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Ovo je puno ime vaÅ¡eg ldap servera. Na primer, â??ldap.mojepreduzece.comâ??."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Ovo je najveÄ?i broj unosa za preuzimanje. Ako unesete suviÅ¡e veliki broj "
-"usporiÄ?ete imenik."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Evolucija Ä?e koristiti ovaj metod da vas prijavi.  Primetite da njegovo "
-"ukljuÄ?ivanje na â??Elektronska adresaâ?? zahteva anonimni pristup na ldap server."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Ovo je ime servera koje Ä?e se pojaviti u listi fascikli Evolucije. To je "
-"samo za potrebe prikazivanja. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Ovo je port LDAP servera na koji Ä?e Evolucija pokuÅ¡ati da se poveže. "
-"PonuÄ?ena je lista standardnih portova. Pitajte svog administratora sistema "
-"koji port da navedete."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "KoriÅ¡Ä?enje posebnog imena (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "KoriÅ¡Ä?enje elektronske adrese"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Kad god je moguÄ?e"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Dodaj imenik"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "OgraniÄ?enje za _preuzimanje:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "_NaÄ?i moguÄ?e baze za pretragu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "Metod _prijave:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "Obim p_retrage:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Rok:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "karte"
 
 # bug: plural-forms
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minuta"
 
@@ -1358,44 +1203,43 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Razno</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#| msgid "<b>Home</b>"
+msgid "<b>Notes</b>"
+msgstr "<b>Napomene</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Ostalo</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Veb adrese</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Posao</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "UreÄ?ivaÄ? za kontakte"
 
@@ -1404,1277 +1248,260 @@ msgid "Full _Name..."
 msgstr "Puno _ime..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 msgid "Image"
 msgstr "Slika"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN glasnik"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Adresa stanovanja"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "Na_dimak:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Napomene"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "LiÄ?ni podaci"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Telefon"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "Posao"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_PomoÄ?nik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_RoÄ?endan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Grad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "Pr_eduzeÄ?e:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Država:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "Smesti _pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_LiÄ?na strana:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
-msgstr "_Upravnik:"
+msgstr "_Rukovodilac:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "_Beleške:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Kancelarija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Poštanski broj:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "S_upružnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Republika/pokrajina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
-msgstr "_Titula:"
+msgstr "_Zvanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Video razgovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "_Želi da prima HTML poštu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Veb log:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Gde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "Poš_tanski broj:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "Adresa"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1827 ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
+#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Izmenljivo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "Sjedinjene Države"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "Avganistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "Albanija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "Alžir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "AmeriÄ?ka Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Andora"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Angila"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "Antarktik"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "Antiga i Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Argentina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "Jermenija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "Australija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "Austrija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "Azerbejdžan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Bahami"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Bahrein"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Bangladeš"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "Belorusija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "Belgija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Bermuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "Butan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "Bolivija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "Bosna i Hercegovina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Bocvana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Buve Ostrvo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Brazil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "Britanska Teritorija Indijskog Okeana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "Brunej Darusalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "Bugarska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Kambodža"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "Kamerun"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "Zelenortska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "Kajmanska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "CentralnoafriÄ?ka Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Ä?ad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Ä?ile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "Kina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "BožiÄ?no Ostrvo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Kokos (Kiling) Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "Kolumbija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Komori"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Kongo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Kongo, Demokratska Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Kuk Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "Kostarika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "Obala SlonovaÄ?e"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "Hrvatska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Kuba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Kipar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "Ä?eÅ¡ka Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Danska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Džibuti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Dominika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "Dominikanska Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "Ekvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Egipat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "Ekvatorijalna Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "Eritreja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "Estonija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "Etiopija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "Foklandska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "Farska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "Fidži"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "Finska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "Francuska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "Francuska Gijana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "Francuska Polinezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "Francuske Južne Teritorije"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "Gabon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "Gambija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "Gruzija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "NemaÄ?ka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Gana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "GrÄ?ka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "Grenland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Gvadalup"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Gvatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Gvirnzi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "Gvineja-Bisao"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Gvajana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "Herd i Mekdonald Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "Sveta Stolica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "MaÄ?arska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "Indija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "Indonezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "Iran"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Irska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Ä?ovekovo Ostrvo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Izrael"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "Italija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Jamajka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "Japan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Džersi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "Jordan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "Kazahstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "Kenija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Koreja, Demokratska Narodna Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "Koreja, Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Kuvajt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "Kirgistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "Latvija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "Liban"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Lesoto"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "Liberija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "Libija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Lihtenštajn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "Litvanija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Makao"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "Makedonija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Madagaskar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Malavi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "Malezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Maldivi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Maršalova Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Martinik"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "Mauritanija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "Mauricijus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Mejot"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "Meksiko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "Mikronezija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "Moldavija, Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "Monako"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "Mongolija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Monserat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Maroko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "Mozambik"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Mianmar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "Namibija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "Holandija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "Holandski Antili"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "Nova Kaledonija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "Novi Zeland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "Nikaragva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "Nigerija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Niu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Norfolk Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "Ostrva Severna Mariana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Norveška"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "Oman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "Palestinska Teritorija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "Panama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Papua Nova Gvineja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Paragvaj"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "Filipini"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Pitkern"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "Poljska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "Portoriko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "Katar"
-
-# Za ovu državu nisam Ä?uo ni u snu, tako da sam ostavio u originalu. -- Pa kada si neobrazovan. :)
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "Reunion"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "Rumunija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "Ruska Federacija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "Ruanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "Sveti Kits i Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "Sveta Lucija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "Sveti Vinsent i Grenadini"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "San Marino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "Sao Tome i Principe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "Saudijska Arabija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "Srbija i Crna Gora"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "Sejšeli"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "Sijera Leone"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "Singapur"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "SlovaÄ?ka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "Slovenija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "Solomonska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "Somalija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "Južna Afrika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "Južna Džordžija i Južna SendviÄ? Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "Å panija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "Å ri Lanka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "Sv. Jelena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "Sv. Pjer i Mikelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "Sudan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "Surinam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard i Jan Majen Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "Svazilend"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "Å vedska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "Å vajcarska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "Sirija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "Tajvan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "Tadžikistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "Tanzanija, Ujedinjena Republika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "Tajland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "Timor-Lest"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "Trinidad i Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "Tunis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "Turska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "Turks i Kokos Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "Ukrajina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "Ujedinjeni Arapski Emirati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "Velika Britanija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "Rubna Ostrva SAD"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "Urugvaj"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Venecuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "Vijetnam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "Britanska DeviÄ?anska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "AmeriÄ?ka DeviÄ?anska Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Volis i Futuna Ostrva"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "Zapadna Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "Jemen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "Zambija"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "Zimbabve"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:475
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Ime"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL brzi glasnik"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Džaber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo glasnik"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu'Gadu glasnik"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "Servis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Mesto"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "KorisniÄ?ko ime"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Posao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "KuÄ?a"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Drugo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Izvorna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Obavezna polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Promenjeno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "UreÄ?ivaÄ? za kontakte - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2682,45 +1509,45 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ?? ima nevažeÄ?i format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ?? ima nevažeÄ?i format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ?? je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
-msgstr "_Izaberi imenik"
+msgstr "_Izaberi adresar"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
@@ -2756,111 +1583,61 @@ msgstr ""
 "Jeste li sigurni da hoÄ?ete\n"
 "da obrišete ove kontakte?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Adresa _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Grad:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "Držav_a:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Puna adresa"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "_Poštanski broj:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr"
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"G.\n"
+"G-Ä?a.\n"
+"G-Ä?a.\n"
+"G-Ä?ica\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Poš."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"St.\n"
+"Ml.\n"
+"I\n"
+"II\n"
+"III\n"
+"Poš."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Ml."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "G-Ä?ica"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "G."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "G-Ä?a"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "G-Ä?a"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "St."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Prezime:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Srednje:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_Sufiks:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Dodaj nalog brzog glasnika"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "Ime n_aloga:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "Usluga _brzog glasnika:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_Mesto:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Ä?lanovi:</b>"
@@ -2871,9 +1648,9 @@ msgid "Contact List Editor"
 msgstr "UreÄ?ivaÄ? kontakt liste"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Izaberi..."
 
@@ -2899,11 +1676,11 @@ msgid "_Members"
 msgstr "_Ä?lanovi"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Knjiga"
 
@@ -2925,12 +1702,8 @@ msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
-msgstr ""
-"Ime ili elektronska adresa ovog kontakta veÄ? postoji u ovoj fascikli.  "
-"Želite li ipak da ga dodate?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+msgstr "Ime ili elektronska adresa ovog kontakta veÄ? postoji u ovoj fascikli.  Želite li ipak da ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2949,28 +1722,31 @@ msgstr ""
 "u ovoj fascikli.  Želite li ipak da dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Pripoji"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420
+#: ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-pošta"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
@@ -2983,11 +1759,11 @@ msgstr "E-poÅ¡ta poÄ?inje sa"
 msgid "Name contains"
 msgstr "Ime sadrži"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2995,24 +1771,25 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Upit"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "GreÅ¡ka pri uÄ?itavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817
+#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Model"
 
@@ -3029,105 +1806,111 @@ msgid "Source"
 msgstr "Izvor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Tip"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "Ä?uva kao vKartu..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "Novi kontakt _spisak..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_SaÄ?uvaj kao vKartu..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Pošalji poruku ko_ntaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Pošalji poruku na _listu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Pošalji po_ruku kontaktima"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "Å ta_mpaj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
-msgstr "Umnoži u i_menik..."
+msgstr "Umnož_i u adresar..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "Premesti u imeni_k..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813
+#: ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991
+#: ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109
+#: ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Umnoži"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "_Ubaci"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624
+#: ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628
+#: ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "PomoÄ?nik"
 
@@ -3156,8 +1939,8 @@ msgid "Car Phone"
 msgstr "Telefon u kolima"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3165,7 +1948,7 @@ msgid "Categories"
 msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "PreduzeÄ?e"
 
@@ -3214,22 +1997,22 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
-msgstr "Upravnik"
+msgstr "Rukovodilac"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Nadimak"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Napomena"
 
@@ -3258,14 +2041,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Uloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Supružnik"
 
@@ -3295,55 +2078,61 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Veb strana"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83
+#: ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421
+#: ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../widgets/table/e-table-item.c:3069
+#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Å irina"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95
+#: ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428
+#: ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740
+#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Visina"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ima fokus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Ime polja"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Model teksta"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "NajveÄ?a dužina imena polja"
 
@@ -3351,7 +2140,7 @@ msgstr "NajveÄ?a dužina imena polja"
 msgid "Column Width"
 msgstr "Å irina kolone"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3361,7 +2150,7 @@ msgstr ""
 "\n"
 "Tražim kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3375,7 +2164,7 @@ msgstr ""
 "\n"
 "ili kliknite dvaput ovde za pravljenje novog kontakta."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3385,11 +2174,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Nema predmeta za prikazivanje.\n"
+"Nema stavki za prikazivanje.\n"
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3399,7 +2188,7 @@ msgstr ""
 "\n"
 "Pretraga za kontaktima."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3407,43 +2196,45 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Nema predmeta za prikazivanje."
+"Nema stavki za prikazivanje."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
-msgstr "Poslobna e-pošta"
+msgstr "Poslovna e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "KuÄ?na e-poÅ¡ta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Druga e-pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Izabrano"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ima kursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u Ä?itaÄ?u"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
@@ -3452,96 +2243,101 @@ msgstr "_Pošalji poruku za..."
 msgid "Copy _Email Address"
 msgstr "Umnoži elektronsku _adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Ä?lanovi liste"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "_Video razgovor:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Adresa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "_LiÄ?na strana:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "_Veb log:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "_RoÄ?endan:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "_Godišnjica:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
-msgstr "Titula na poslu"
+msgstr "Zvanje na poslu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "LiÄ?na stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3565,7 +2361,7 @@ msgstr "Arhiva van mreže"
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
-msgstr "Imenik ne postoji"
+msgstr "Adresar ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
@@ -3599,12 +2395,12 @@ msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661
+#: ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Otkazano"
 
@@ -3615,13 +2411,13 @@ msgstr "Nije moguÄ?e odustati"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Autentifikacija obavezna"
 
@@ -3658,40 +2454,21 @@ msgid "Unsupported authentication method"
 msgstr "Metod autentifikacije nije podržan"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar. To znaÄ?i da on ili nije oznaÄ?en za "
-"koriÅ¡Ä?enje van mreže ili da joÅ¡ nije preuzet za rad van mreže. UÄ?itajte "
-"adresar kada se povežete radi preuzimanja njegovog sadržaja."
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "Ne mogu da otvorim ovaj adresar. To znaÄ?i da on ili nije oznaÄ?en za koriÅ¡Ä?enje van mreže ili da joÅ¡ nije preuzet za rad van mreže. UÄ?itajte adresar kada se povežete radi preuzimanja njegovog sadržaja."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Nije moguÄ?e otvaranje ovog adresara.  Proverite da putanja %s postoji i da "
-"imate prava pristupa."
+msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgstr "Nije moguÄ?e otvaranje ovog adresara.  Proverite da putanja %s postoji i da imate prava pristupa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:131
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Ovo izdanje Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da "
-"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
-"podrškom za LDAP."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr "Ovo izdanje Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa podrškom za LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
-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."
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+msgstr "Nije moguÄ?e otvaranje ovog adresara.  To znaÄ?i da ste ili uneli pogreÅ¡nu adresu, ili je server nedostupan."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
 msgid "Detailed error message:"
@@ -3710,7 +2487,6 @@ msgstr ""
 "broja rezultata u postavkama adresara za server direktorijuma."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
-#, fuzzy
 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"
@@ -3718,9 +2494,9 @@ 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"
-"upit ili poveÄ?ajte vremensko ograniÄ?enje u postavkama adresara\n"
-"za server direktorijuma."
+"ograniÄ?enja koji ste podesili za ovaj adresar. Preciznije oblikujte\n"
+"upit ili poveÄ?ajte vremensko ograniÄ?enje u postavkama servera\n"
+"direktorijuma za ovaj adresar."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
@@ -3739,7 +2515,7 @@ msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
@@ -3756,7 +2532,7 @@ msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
@@ -3787,7 +2563,7 @@ msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3796,15 +2572,15 @@ msgstr ""
 "%s veÄ? postoji\n"
 "Želite li da prepišete?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Prepiši"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
@@ -3812,31 +2588,31 @@ msgstr[1] "kontakti"
 msgstr[2] "kontakta"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
-msgstr "Izaberi imenik"
+msgstr "Izaberi adresar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Umnoži kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
@@ -3860,368 +2636,146 @@ msgstr "Kontakt"
 msgid "Contact information for %s"
 msgstr "Kontakt podaci za %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
-msgstr "Slanje upita imeniku..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Postoji još %d kontakt."
-msgstr[1] "Postoji još %d kontakta."
-msgstr[2] "Postoji još %d kontakta."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Prikaži punu vKartu"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Prikaži sažetu vKartu"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "SaÄ?uvaj u adresar"
+msgstr "Slanje upita adresaru..."
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687
+#: ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Uvoženje..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozila CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "Evolution CSV ili Tab (.csv, .tab)"
+msgstr "Evolucija CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolucijin CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolucija LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin uvoznik vKarti"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 p. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 p. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Prazni obrasci na kraju:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Telo"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Dno:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimenzije:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "F_ont..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Slovni lik"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Podnožje:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Zaglavlje"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Zaglavlje/podnožje"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Zaglavlja"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Zaglavlja za svako pismo"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Visina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Odmah prati jedno drugo"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "UkljuÄ?uje:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Položeno"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Levo:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "JeziÄ?ci sa slovima sa strane"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margine"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Broj kolona:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Opcije"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Položaj"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Strana"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Podešavanje strane:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papir"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Izvor papira:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Uspravno"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Pregled:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Å tampaj koristeÄ?i sive tonove"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Obrnuto na parnim stranama"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Desno:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Odeljci:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "SenÄ?enje"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "VeliÄ?ina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "PoÄ?ni na novoj strani"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Ime stila:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Vrh:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Tip:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Å irina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Slovni lik..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Datoteka ne može biti otvorena"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "Lista adresara nije dostupna"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "neuspelo otvaranje knjige"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
-msgstr "Lista fascikli lokalnog adresara"
+msgstr "Spisak fascikli lokalnog adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Prikaži karte kao vkartu ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Izvezi u neusklaÄ?enom režimu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Broj karti u jednoj izlaznoj datoteci u neusklaÄ?enom režimu, podrazumevana "
-"veliÄ?ina 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:59
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "Broj karti u jednoj izlaznoj datoteci u neusklaÄ?enom režimu, podrazumevana veliÄ?ina 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Greška u argumentima komande, koristite opciju --help da vidite kako se "
-"koristi."
+#: ../addressbook/tools/evolution-addressbook-export.c:99
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Greška u argumentima komande, koristite opciju --help da vidite kako se koristi."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv ili vcard oblik."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 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:130
 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:161
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"Kalendar â??{0}â?? je samo za Ä?itanje i nije podložan izmenama. Izaberite drugi "
-"kalendar sa boÄ?ne trake u pogledu Kalendara."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgstr "Kalendar â??{0}â?? je samo za Ä?itanje i nije podložan izmenama. Izaberite drugi kalendar sa boÄ?ne trake u pregledu kalendara."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"Kalendar â??{0}â?? je samo za Ä?itanje i nije ga moguÄ?e menjati. Izaberite drugi "
-"kalendar koji prihvata zakazivanje."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgstr "Kalendar â??{0}â?? je samo za Ä?itanje i nije ga moguÄ?e menjati. Izaberite drugi kalendar koji prihvata zakazivanje."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"Dodavanjem smislenog kratkog opisa VaÅ¡em sastanku daÄ?ete primaocima do znanja "
-"u vezi Ä?ega zakazujete sastanak."
+msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "Dodavanjem smislenog sažetka zakazivanju daÄ?ete primaocima do znanja u vezi Ä?ega zakazujete."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Dodavanjem smislenog kratkog opisa VaÅ¡em zaduženju daÄ?ete primaocima do znanja "
-"šta je zaduženje."
+msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
+msgstr "Dodavanjem smislenog sažetka zadatku daÄ?ete primaocima do znanja u vezi Ä?ega je zadatak."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -4232,28 +2786,20 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Svi podaci u ovoj beleÅ¡ci biÄ?e obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Svi podaci o ovim zakazanim sastancima biÄ?e obrisani i neÄ?e se moÄ?i "
-"povratiti."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "Svi podaci o ovim zakazivanjima biÄ?e obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Svi podaci o ovim zaduženjima biÄ?e uklonjeni i neÄ?e se moÄ?i povratiti."
+msgstr "Svi podaci o ovim zadacima biÄ?e uklonjeni i neÄ?e se moÄ?i povratiti."
 
 # calendar:prompt-delete-appointment secondary
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Svi podaci o ovom zakazanom sastanku Ä?e biti obrisani i neÄ?e se moÄ?i "
-"povratiti."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Svi podaci o ovom zakazivanju Ä?e biti obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Svi podaci o ovom sastanku Ä?e biti uklonjeni i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4264,15 +2810,15 @@ msgstr "Svi podaci u ovoj beleÅ¡ci Ä?e biti uklonjeni i neÄ?e se moÄ?i povratiti
 # 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 zaduženju Ä?e biti obrisani i neÄ?e se moÄ?i povratiti."
+msgstr "Svi podaci o ovom zadatku Ä?e biti obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Sigurno želite da obriÅ¡ete â??{0}â?? zaduženje?"
+msgstr "Sigurno želite da obriÅ¡ete â??{0}â?? zadatak?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Sigurno želite da obriÅ¡ete zakazani sastanak nazvan â??{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 memo '{0}'?"
@@ -4281,7 +2827,7 @@ msgstr "Sigurno želite da obriÅ¡ete beleÅ¡ku â??{0}â?? ?"
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Sigurno želite da obrišete ove {0} zakazane sastanke?"
+msgstr "Sigurno želite da obrišete ova {0} zakazivanja?"
 
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
@@ -4290,11 +2836,11 @@ msgstr "Sigurno želite da obrišete ove {0} beleške?"
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Sigurno želite da obrišete ova {0} zaduženja?"
+msgstr "Sigurno želite da obrišete ove {0} zadatke?"
 
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
-msgstr "Sigurno želite da obrišete ovaj zakazani sastanak?"
+msgstr "Sigurno želite da obrišete ovo zakazivanje?"
 
 #: ../calendar/calendar.error.xml.h:22
 #: ../calendar/gui/dialogs/delete-comp.c:182
@@ -4312,19 +2858,19 @@ msgstr "Sigurno želite da obrišete ovau belešku?"
 #: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
-msgstr "Sigurno želite da obrišete ovo zaduženje?"
+msgstr "Sigurno želite da obrišete ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Sigurno želite da saÄ?uvate beleÅ¡ku bez saÄ?injenog pregleda?"
+msgstr "Sigurno želite da saÄ?uvate beleÅ¡ku bez sažetka?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Sigurno želite da zakažete sastanak bez saÄ?injenog pregleda?"
+msgstr "Sigurno želite da pošaljete zakazivanje bez sažetka?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "Sigurno želite da poÅ¡aljete zaduženje bez saÄ?injenog pregleda?"
+msgstr "Sigurno želite da pošaljete zadatak bez sažetka?"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Calendar repository is offline."
@@ -4332,15 +2878,15 @@ msgstr "Arhiva kalendara je van mreže."
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
-msgstr "Ne mogu napraviti jedan novi dogaÄ?aj"
+msgstr "Nije moguÄ?e napraviti novi dogaÄ?aj"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
-msgstr "Ne mogu saÄ?uvati dogaÄ?aj"
+msgstr "Nije moguÄ?e saÄ?uvati dogaÄ?aj"
 
 #: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
-msgstr "Obrisati kalendar â??{0}â???"
+msgstr "Obrisati kalendar â??{0}â???"
 
 #: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
@@ -4348,7 +2894,7 @@ msgstr "Obrisati spisak beleÅ¡ki â??{0}â???"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "Obrisati spisak zaduženja â??{0}â???"
+msgstr "Obrisati spisak zadataka â??{0}â???"
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
@@ -4356,31 +2902,24 @@ msgstr "Ne Å¡alj_i"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Preuzimanje u toku. Želite li da saÄ?uvate zakazani sastanak?"
+msgstr "Preuzimanje u toku. Želite li da saÄ?uvate zakazivanje?"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
-msgstr "Preuzimanje u toku. Želite li da saÄ?uvate zaduženje?"
+msgstr "Preuzimanje u toku. Želite li da saÄ?uvate zadatak?"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "UreÄ?ivaÄ? nije mogao biti uÄ?itan."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Pozivnice e-poÅ¡tom biÄ?e poslate svim uÄ?esnicima da bi mogli da prihvate ovo "
-"zaduženje."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Pozivnice e-poÅ¡tom biÄ?e poslate svim uÄ?esnicima da bi mogli da prihvate ovaj zadatak."
 
 # bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
-msgstr ""
-"Pozivnice Ä?e biti poslate e-poÅ¡tom svim uÄ?esnicima i omoguÄ?iÄ?e im da "
-"odgovore."
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Pozivnice Ä?e biti poslate e-poÅ¡tom svim uÄ?esnicima i omoguÄ?iÄ?e im da odgovore."
 
 #: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
@@ -4392,7 +2931,7 @@ msgstr "GreÅ¡ka pri uÄ?itavanju spiska beleÅ¡ki"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
-msgstr "GreÅ¡ka pri uÄ?itavanju spiska zaduženja"
+msgstr "GreÅ¡ka pri uÄ?itavanju spiska zadataka"
 
 #. For Translators: {0} is specify the backend server
 #: ../calendar/calendar.error.xml.h:44
@@ -4400,36 +2939,24 @@ msgid "Error on '{0}'"
 msgstr "GreÅ¡ka na â??{0}â??"
 
 #: ../calendar/calendar.error.xml.h:45
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e "
-"znati da je sastanak otkazan."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgstr "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e znati da je sastanak otkazan."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e "
-"znati da je beleška obrisana."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e znati da je beleÅ¡ka obrisana."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e "
-"znati da je zaduženje obrisano."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgstr "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e znati da je zadatak obrisan."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "No response from the server."
-msgstr ""
+msgstr "Nema odgovora servera."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "Save Appointment"
-msgstr "SaÄ?uvaj zakazani sastanak"
+msgstr "SaÄ?uvaj zakazivanje"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "Save Memo"
@@ -4437,43 +2964,27 @@ msgstr "SaÄ?uva beleÅ¡ku"
 
 #: ../calendar/calendar.error.xml.h:51
 msgid "Save Task"
-msgstr "SaÄ?uvaj zaduženje"
+msgstr "SaÄ?uvaj zadatak"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Slanje osveženih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov kalendar bude "
-"u toku."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Slanje osveženih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov kalendar bude u toku."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Slanje osveženih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov spisak "
-"zaduženja bude u toku."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Slanje osveženih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov spisak zadataka bude u toku."
 
 #: ../calendar/calendar.error.xml.h:55
-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 zakazani sastanak ovi "
-"prilozi neÄ?e biti saÄ?uvani sa njim."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgstr "Preuzima se nekoliko priloga. Ukoliko sada saÄ?uvate zakazivanje ovi prilozi neÄ?e biti saÄ?uvani sa njim."
 
 #: ../calendar/calendar.error.xml.h:56
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Preuzimanje nekoliko priloga je u toku. Ukoliko sada saÄ?uvate zaduženje ovi "
-"prilozi neÄ?e biti saÄ?uvani sa njim."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgstr "Preuzimanje nekoliko priloga je u toku. Ukoliko sada saÄ?uvate zadatak ovi prilozi neÄ?e biti saÄ?uvani sa njim."
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
-msgstr "Na tekuÄ?oj verziji servera neke moguÄ?nosti možda neÄ?e ispravno raditi"
+msgstr "Na tekuÄ?oj verziji servera neke moguÄ?nosti možda neÄ?e ispravno raditi."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4489,7 +3000,7 @@ msgstr "Kalendar Evolucije je neoÄ?ekivano zavrÅ¡io."
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolucija zaduženja su neoÄ?ekivano zavrÅ¡ila."
+msgstr "Zadaci Evolucije su neoÄ?ekivano zavrÅ¡ili."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
@@ -4501,7 +3012,7 @@ msgstr "Spisak beleÅ¡ki nije oznaÄ?en za koriÅ¡Ä?enje van mreže."
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
-msgstr "Spisak zaduženja nije oznaÄ?en za koriÅ¡Ä?enje van mreže."
+msgstr "Spisak zadataka nije oznaÄ?en za koriÅ¡Ä?enje van mreže."
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
@@ -4513,7 +3024,7 @@ msgstr "Ovaj spisak beleÅ¡ki Ä?e biti trajno uklonjen."
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
-msgstr "Ovaj spisak zaduženja Ä?e biti trajno uklonjen."
+msgstr "Ovaj spisak zadataka Ä?e biti trajno uklonjen."
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Unable to load the calendar"
@@ -4521,19 +3032,19 @@ msgstr "Ne mogu da otvorim kalendar"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
-msgstr "Želite li da saÄ?uvate promene na zakazanom sastanku?"
+msgstr "Želite li da saÄ?uvate promene u zakazivanju?"
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
-msgstr "Želite li da saÄ?uvate promene u ovim beleÅ¡kama?"
+msgstr "Želite li da saÄ?uvate promene na ovoj beleÅ¡ci?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
-msgstr "Želite li da saÄ?uvate promene na zaduženju?"
+msgstr "Želite li da saÄ?uvate promene na ovom zadatku?"
 
 #: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Želite li da pošaljete obaveštenje o otkazivanju za ovau belešku?"
+msgstr "Želite li da pošaljete obaveštenje o otkazivanju za ovu belešku?"
 
 # calendar:prompt-cancel-task primary
 #: ../calendar/calendar.error.xml.h:73
@@ -4546,7 +3057,7 @@ msgstr "Želite li da poÅ¡aljete pozive na sastanak uÄ?esnicima?"
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
-msgstr "Želite li da poÅ¡aljete ovo zaduženje uÄ?esnicima?"
+msgstr "Želite li da poÅ¡aljete ovaj zadatak uÄ?esnicima?"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
@@ -4554,24 +3065,19 @@ msgstr "Želite li da poÅ¡aljete osvežene podatke o sastanku uÄ?esnicima?"
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
-msgstr "Želite li da poÅ¡aljete osvežene podatke o zaduženju uÄ?esnicima?"
+msgstr "Želite li da poÅ¡aljete osvežene podatke o zadatku uÄ?esnicima?"
 
 #: ../calendar/calendar.error.xml.h:78
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"Povezujete se na nepodržan GroupWise server što može da dovede do problema u "
-"radu Evolucije. Najbolje je da server bude nadograÄ?en na podržanu verziju."
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgstr "Povezujete se na nepodržan GroupWise server Å¡to može da dovede do problema u radu Evolucije. Najbolje je da server bude nadograÄ?en na podržanu verziju."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "Promenili ste ovaj zakazani sastanak, ali promene joÅ¡ niste saÄ?uvali."
+msgstr "Promenili ste ovaj zakazivanje, ali promene joÅ¡ niste saÄ?uvali."
 
 #: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
-msgstr "Promenili ste ovo zaduženje, ali promene joÅ¡ niste saÄ?uvali."
+msgstr "Promenili ste ovaj zadatak, ali promene joÅ¡ niste saÄ?uvali."
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
@@ -4587,14 +3093,15 @@ msgstr "BeleÅ¡ka neÄ?e biti dostupna dok se Evolucija ponovo ne pokrene."
 
 #: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Zaduženja neÄ?e biti dostupna dok se Evolucija ponovo ne pokrene."
+msgstr "Zadaci neÄ?e biti dostupni dok se Evolucija ponovo ne pokrene."
 
 #: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Zanemari promene"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_SaÄ?uvaj"
 
@@ -4603,7 +3110,8 @@ msgid "_Save Changes"
 msgstr "SaÄ?uvaj pro_mene"
 
 #: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Pošalji"
@@ -4616,66 +3124,66 @@ msgstr "Pošalji po_dsetnik"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Podeli viÅ¡ednevne dogaÄ?aje:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Neuspelo pokretanje evolucija-servera-podataka"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Neuspelo Ä?itanje programskog bloka pilotovog Kalendara"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Neuspelo Ä?itanje pilotovog bloka beleÅ¡ki"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Neuspeo upis pilotovog bloka beleški"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Podrazumevana važnost:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Neuspelo Ä?itanje pilotovog ToDo programskog bloka"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "Neuspeo upis u pilotov blok â??uraditiâ??"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
-msgstr "Kalendar i zaduženja"
+msgstr "Kalendar i zadaci"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Kalendari"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Podesite vremensku zonu, kalendar i listu zaduženja ovde "
+msgstr "Podesite vremensku zonu, kalendar i spisak zadataka ovde "
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
-msgstr "Evolucija kalendar i zaduženja"
+msgstr "Evolucija kalendar i zadaci"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
@@ -4687,46 +3195,53 @@ msgstr "PregledaÄ? zakazanih poruka Evolucija kalendara"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
-msgstr "UreÄ?ivaÄ? Evolucija kalendara/zaduženja"
+msgstr "UreÄ?ivaÄ? Evolucija kalendara/zadataka"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
-msgstr "Deo Evolucije â?? Kalendar"
+msgstr "Deo kalendara Evolucije"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr "Deo Evolucije â?? BeleÅ¡ke"
+msgstr "Deo beleški Evolucije"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
-msgstr "Deo Evolucije â?? Zaduženja"
+msgstr "Deo zadataka Evolucije"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "Be_leške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:389
-#: ../calendar/gui/memos-control.c:405
+#: ../calendar/gui/e-memo-table.c:293
+#: ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846
+#: ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Beleške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
+#: ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714
+#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557
+#: ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524
+#: ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
-msgstr "Zaduženja"
+msgstr "Zadaci"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
@@ -4734,58 +3249,59 @@ msgstr "_Kalendari"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
-msgstr "_Zaduženja"
+msgstr "_Zadaci"
 
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
-msgstr "Servis za upozorenja Evolucija kalendara"
+msgstr "Servis za alarme kalendara Evolucije"
 
 # bug: plural-forms
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "sat"
 msgstr[1] "sata"
 msgstr[2] "sati"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Vreme poÄ?etka"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
-msgstr "Zakazani sastanci"
+msgstr "Zakazivanja"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Dismiss _All"
-msgstr ""
+msgstr "Zanemari _sve"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
-msgstr "Mesto:"
+msgstr "Lokacija:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "Snooze _time:"
@@ -4793,17 +3309,21 @@ msgstr "Vreme _dremanja:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Dismiss"
-msgstr ""
+msgstr "_Zanemari"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../ui/evolution-addressbook.xml.h:51
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_UreÄ?ivanje"
@@ -4814,35 +3334,35 @@ msgstr "Dre_manje"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "location of appointment"
-msgstr "zakazano mesto sastanka"
+msgstr "zakazana lokacija"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
-msgstr "Nema dostupnog pregleda."
+msgstr "Nema dostupnog sažetka."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
-msgstr "Nema dostupnog podatka o mestu."
+msgstr "Nema dostupnog podatka o lokaciji."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "Broj postavljenih alarma: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4854,24 +3374,22 @@ msgstr ""
 "podsetnik podeÅ¡en da poÅ¡alje poruku. Evolucija Ä?e\n"
 "umesto toga prikazati normalno prozorÄ?e."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Podsetnik Evolucija kalendara Ä?e biti pokrenut. Ovaj podsetnik je podeÅ¡en da "
-"pokrene sledeÄ?i program:\n"
+"Podsetnik Evolucija kalendara Ä?e biti pokrenut. Ovaj podsetnik je podeÅ¡en da pokrene sledeÄ?i program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Sigurno želite da pokrenete ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -4880,9 +3398,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nije moguÄ?e pokrenuti Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "Nije moguÄ?e pokrenuti servis za upozorenja, možda je veÄ? aktivan..."
 
 #: ../calendar/gui/alarm-notify/util.c:44
@@ -4890,7 +3406,8 @@ msgid "invalid time"
 msgstr "neispravno vreme"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4900,7 +3417,8 @@ msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4912,7 +3430,8 @@ msgstr[2] "%d minuta"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -4928,11 +3447,11 @@ msgstr "Programi za alarm"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj liniji."
+msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj traci."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
-msgstr "Traži potvrdu za brisanje predmeta"
+msgstr "Traži potvrdu za brisanje stavki"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
@@ -4947,659 +3466,642 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendari za koje se pokreÄ?e alarm"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Boja za iscrtavanje Markus Bejns linije u liniji vremena (podrazumevano je "
-"prazno)."
+msgid "Check this to use system timezone in Evolution."
+msgstr "OznaÄ?ite ovo da bi Evolucija koristila vremensku zonu sistema."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Boja za iscrtavanje Markus Bejns linije u dnevnom pregledu."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Boja za iscrtavanje Markus Bejns linije u traci vremena (podrazumevano je prazno)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Sažmi vikende u meseÄ?ni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Potvrdi pražnjenje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "Broj podrazumevanih ponavljanja novog dogaÄ?aja. -1 znaÄ?i zauvek."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Potrebno je oznaÄ?iti dane kojima poÄ?inju i zavrÅ¡avaju se radni Ä?asovi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
-msgstr "Podrazumevani podsetnik za sastanak"
+msgstr "Podrazumevani podsetnik za zakazivanje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#| msgid "Default reminder units"
+msgid "Default recurrence count"
+msgstr "Podrazumevan broj ponavljanja"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Direktorijum za Ä?uvanje zvuÄ?nih datoteka alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Stepen dogaÄ?aja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Providnost dogaÄ?aja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "Adrese servera za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Stepen dogaÄ?aja u pregledu kalendara."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
-msgstr "Sakrij završena zaduženja"
+msgstr "Sakrij završene zadatke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
-msgstr "Sakrij jedinice zaduženja"
+msgstr "Sakrij jedinice zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
-msgstr "Sakrij vrednost zaduženja"
+msgstr "Sakrij vrednost zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Pozicija položene površi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Sat kojim se zavrÅ¡ava radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 "
-"do 23."
+msgstr "Sat kojim se zavrÅ¡ava radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Sat kojim poÄ?inje radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 do 23."
+msgstr "Sat kojim poÄ?inje radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Poslednje vreme za alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
-msgstr ""
+msgstr "Spisak nedavno koriÅ¡Ä?enih drugih vremenskih zona u Dnevnom pregledu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "Spisak adresa servera za objavljivanje slobodnog/zauzetog vremena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Boja Markus Bejns linije - dnevni pregled"
+msgstr "Boja Markus Bejns linije - Dnevni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Boja Markus Bejns linije - linija vremena"
+msgstr "Boja Markus Bejns linije - traka vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgstr "NajveÄ?i broj nedavno koriÅ¡Ä?enih vremenskih zona za pamÄ?enje u spisku â??day_second_zonesâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
-msgstr ""
+msgstr "NajveÄ?i broj nedavno koriÅ¡Ä?enih vremenskih zona za pamÄ?enje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut kojim se završava radni dan, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut kojim poÄ?inje radni dan, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
-msgstr "Pozicija položene povrÅ¡i meseÄ?nog pregleda"
+msgstr "Pozicija položene povrÅ¡i MeseÄ?nog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
-msgstr "Pozicija uspravne povrÅ¡i meseÄ?nog pregleda"
+msgstr "Pozicija uspravne povrÅ¡i MeseÄ?nog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "Broj jedinica za odreÄ?ivanje podrazumevanog podsetnika."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Number of units for determining when to hide tasks."
-msgstr "Broj jedinica za odreÄ?ivanje kada sakriti zaduženja."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Overdue tasks color"
-msgstr "Boja prekoraÄ?enih zaduženja"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-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 liste zaduženja "
-"kada nije postavljen meseÄ?ni pregled, u pikselima."
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
-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 liste "
-"zaduženja u meseÄ?nom pregledu, u pikselima."
+msgid "Number of units for determining when to hide tasks."
+msgstr "Broj jedinica za odreÄ?ivanje kada sakriti zadatke."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Položaj uspravne povrÅ¡i, izmeÄ?u liste kalendara i navigacije kalendara po "
-"datumu."
+msgid "Overdue tasks color"
+msgstr "Boja prekoraÄ?enih zadataka"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Pozicija uspravne povrÅ¡i, izmeÄ?u liste zaduženja i panela za pregled "
-"zaduženja, u pikselima."
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "Pozicija položene povrÅ¡i, izmeÄ?u dela kalendara za datum i spiska zadataka kada nije postavljen meseÄ?ni pregled, u pikselima."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-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 kalenda za datum i liste "
-"zaduženja u meseÄ?nom pregledu, u pikselima."
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Pozicija položene povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska zadataka u meseÄ?nom pregledu, u pikselima."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-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 liste "
-"zaduženja kada nije postavljen meseÄ?ni pregled, u pikselima."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+msgstr "Položaj uspravne povrÅ¡i, izmeÄ?u liste kalendara i navigacije kalendara po datumu."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgstr "Pozicija uspravne povrÅ¡i, izmeÄ?u spiska zadataka i panela za pregled zadataka, u pikselima."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Pozicija uspravne povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska zadataka u meseÄ?nom pregledu, u pikselima."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "Pozicija uspravne povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska zadataka kada nije postavljen meseÄ?ni pregled, u pikselima."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#| msgid "Print this calendar"
+msgid "Primary calendar"
+msgstr "Primarni kalendar"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#| msgid "New memo list"
+msgid "Primary memo list"
+msgstr "Primarni spisak beleški"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#| msgid "New task list"
+msgid "Primary task list"
+msgstr "Primarni spisak zadataka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programi koji mogu biti pokrenuti alarmima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
-msgstr ""
+msgstr "Nedavno koriÅ¡Ä?ene druge vremenske zone u Dnevnom pregledu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Direktorijum za Ä?uvanje zvuÄ?nih alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "MeseÄ?ni pregled po nedeljama"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Prikaži RSVP polje u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta"
+msgstr "Prikaži RSVP polje u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "Prikaži polje uloge u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta"
+msgstr "Prikaži polje uloge u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
-msgstr "Prikazuje vremena zavrÅ¡etka sastanaka u nedeljnim i meseÄ?nim pregledima"
+msgstr "Prikazuje vremena zakazanog zavrÅ¡etka u nedeljnim i meseÄ?nim pregledima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "Prikaži polje kategorije u ureÄ?ivaÄ?u dogaÄ?aja/susreta/zaduženja"
+msgstr "Prikaži polje kategorije u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka/zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "Prikazuje alarme u obaveštajnoj zoni"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Prikaži polje â??Stanjeâ?? u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta"
+msgstr "Prikaži polje stanja u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži povrÅ¡ â??Pregledâ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Prikazuje povrÅ¡ â??Pregledâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Prikaži polje vremenske zone u ureÄ?ivaÄ?u dogaÄ?aja (susreta)"
+msgstr "Prikaži polje vremenske zone u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Prikaži polje â??Vrstaâ?? u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta"
+msgstr "Prikaži polje tipa u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
-msgstr "Prikazuje brojeve nedelja u delu za datum"
+msgstr "Prikazuje broj nedelje u dnevnom i pregledu za radnu nedelju"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "Prikazuje brojeve nedelja u delu za datum"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr "Prikazuje drugu vremensku zonu u Dnevnom pregledu, ukoliko je podeÅ¡ena. Vrednost je sliÄ?na onoj koja je koriÅ¡Ä?ena u kljuÄ?u â??timezoneâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
-msgstr "Boja zaduženja za danas"
+msgstr "Boja zadatka za danas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
-msgstr "Pozicija uspravne površi zaduženja"
+msgstr "Pozicija uspravne površi zadatka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Model adrese za koriÅ¡Ä?enje u povraÄ?aju vremena slobodno/zauzeto, %u se "
-"zamenjuje korisniÄ?kim delom elektronske adrese, a %d domenom."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "Model adrese za koriÅ¡Ä?enje u povraÄ?aju vremena slobodno/zauzeto, %u se zamenjuje korisniÄ?kim delom elektronske adrese, a %d domenom."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
-"neprevedeno mesto baze vremenske zone Olsen, kao â??Amerika/Njujorkâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao neprevedeno mesto baze vremenske zone Olsen, kao â??Amerika/Njujorkâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
-msgstr ""
+msgstr "Druga vremenska zona u Dnevnom pregledu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Može imati tri vrednosti. â??0â?? za greÅ¡ke. â??1â?? za upozorenja. â??2â?? za poruke o "
-"dijagnozi kvara."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgstr "Može imati tri vrednosti. 0 za greške. 1 za upozorenja. 2 za poruke o dijagnozi kvara."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
-msgstr "Podela _vremena"
+msgstr "Podela vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "Vreme poslednjeg pokretanja alarma, u time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Providnost dokaÄ?aja u pregledu kalendara, vrednost izmeÄ?u 0 (providno) i 1 "
-"(neprovidno)"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+msgstr "Providnost dokaÄ?aja u pregledu kalendara, vrednost izmeÄ?u 0 (providno) i 1 (neprovidno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24-Ä?asovni oblik vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "Adresa oznaÄ?enog â??primarnogâ?? kalendara"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "Adresa oznaÄ?enog â??primarnogâ?? spiska beleÅ¡ki"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "Adresa oznaÄ?enog â??primarnogâ?? spiska zadataka"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Jedinice za podrazumevani podsetnik, â??minutesâ?? (minuti), â??hoursâ?? (sati) ili "
-"â??daysâ?? (dani)."
+msgstr "Jedinice za podrazumevani podsetnik, â??minutiâ??, â??satiâ?? ili â??daniâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Jedinice za odreÄ?ivanje kada sakriti zaduženja, â??minutesâ?? (minuti), "
-"â??hoursâ?? (sati) ili â??daysâ?? (dani)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Jedinice za odreÄ?ivanje kada sakriti zaduženja, â??minutiâ??, â??satiâ?? ili â??daniâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#| msgid "_Use system defaults"
+msgid "Use system timezone"
+msgstr "Koristi vremensku zonu sistema"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "PoÄ?etak nedelje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dan kojim poÄ?inje nedelja, od nedelje (0) do subote (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Da li da koristi obaveštajnu zonu za prikazivanje alarma."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Da li da traži potvrdu za brisanje sastanka ili zaduženja."
+msgstr "Da li da traži potvrdu za brisanje zakazivanja ili zadatka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Da li da traži potvrdu pri izbacivanju sastanka i zaduženja."
+msgstr "Da li da traži potvrdu pri izbacivanjuzakazivanja ili zadatka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Da li da sažme vikende u meseÄ?nom pregledu, koji subotu i nedelju stavlja u "
-"prostor radne nedelje."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "Da li da sažme vikende u meseÄ?nom pregledu, koji subotu i nedelju stavlja u prostor radne nedelje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"Da li da prikaže vremena zavrÅ¡etka dogaÄ?aja u nedeljnim i meseÄ?nim pregledima."
+msgstr "Da li da prikaže vremena zavrÅ¡etka dogaÄ?aja u nedeljnim i meseÄ?nim pregledima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Da li da sakrije završena zaduženja u pregledu zaduženja."
+msgstr "Da li da sakrije završene zadatke u pregledu zadataka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "Da li da prikaže MeseÄ?ni pregled po nedeljama, umesto mesecima."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
-msgstr "Da li da postavi podrazumevani podsetnik za zakazane sastanke."
+msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Da li da prikaže RSVP polje u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/sastanaka"
+msgstr "Da li da prikaže polje RSVP u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Da li da prikaže polje kategorije u ureÄ?ivaÄ?u dogaÄ?aja (sastanaka)"
+msgstr "Da li da prikaže polje kategorije u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Da li da prikaže polje sa ulogom u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta."
+msgstr "Da li da prikaže polje sa ulogom u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Da li da prikaže polje sa stanjem u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta."
+msgstr "Da li da prikaže polje statusa u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-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 obliku umesto am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Da li da prikaže vreme u dvadesetoÄ?asovnom formatu, umesto am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Da li da prikaže polje vremenske zone u ureÄ?ivaÄ?u dogaÄ?aja (sastanaka)."
+msgstr "Da li da prikaže polje vremenske zone u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Da li da prikaže polje vrstu u ureÄ?ivaÄ?u dogaÄ?aja/zaduženja/susreta."
+msgstr "Da li da prikaže polje tipa u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
-msgstr "Da li da prikaže brojeve nedelja u delu za datum."
+msgstr "Da li da prikaže broj nedelje u pregledima za dan i radnu nedelju."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Da li da prikaže brojeve nedelja u delu za datum."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Dali da se koristi letnje raÄ?unanje vremena kada se prikazuju dogaÄ?aji."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Radni dani"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "Ä?as kojim se zavrÅ¡ava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Minut kojim se završava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "Ä?as kojim poÄ?inje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Minut kojim poÄ?inje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "Letnje raÄ?unanje vremena"
+#: ../calendar/gui/cal-editor-utils.c:100
+#| msgid "Invalid contact."
+msgid "Invalid object"
+msgstr "Neispravan objekat"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
-msgstr "Pregled sadrži"
+msgstr "Sažetak sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Kategorija je"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
-msgstr "Mesto sadrži"
+msgstr "Lokacija sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
-msgstr "Zaduženja za sledeÄ?u nedelju"
+msgstr "Zadaci za sledeÄ?u nedelju"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
-msgstr "Aktivna zaduženja"
+msgstr "Aktivni zadaci"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
-msgstr "PrekoraÄ?ena zaduženja"
+msgstr "PrekoraÄ?eni zadaci"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
-msgstr "Završena zaduženja"
+msgstr "Završeni zadaci"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
-msgstr "Zaduženja sa prilozima"
+msgstr "Zadaci sa prilozima"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
-msgstr "Aktivni sastanci"
+msgstr "Aktivna zakazivanja"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
-msgstr "Sastanci u sledeÄ?ih 7 dana"
+msgstr "Zakazano za sledeÄ?u nedelju"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:89
+#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Å tampaj"
 
-#: ../calendar/gui/calendar-commands.c:315
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Ova radnja Ä?e trajno obrisati sve dogaÄ?aje pre izabranog roka. Ukoliko "
-"nastavite, neÄ?ete moÄ?i da povratite ove dogaÄ?aje."
+#: ../calendar/gui/calendar-commands.c:331
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "Ova Ä?e radnja trajno obrisati sve dogaÄ?aje pre izabranog roka. Ukoliko nastavite, neÄ?ete moÄ?i da povratite ove dogaÄ?aje."
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Izbaci dogaÄ?aje starije od"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dana"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152
+#: ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603
+#: ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Na vebu"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "RoÄ?endani i godiÅ¡njice"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291
+#: ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "RoÄ?endani i godiÅ¡njice"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478
+#: ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483
+#: ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "_OmoguÄ?i za rad van mreže"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484
+#: ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_OnemoguÄ?i da ovo bude dostupno van mreže"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
-msgstr "Neuspela dopuna kalendara."
+msgstr "Neuspela dogradnja kalendara."
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "Nije moguÄ?e otvoriti kalendar â??%sâ?? za pravljenje dogaÄ?aja i sastanaka"
+msgstr "Nije moguÄ?e otvoriti kalendar â??%sâ?? za pravljenje dogaÄ?aja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje dogaÄ?aja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "BiraÄ? izvora kalendara"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
-msgstr "Novi zakazani sastanak"
+msgstr "Novo zakazivanje"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
-msgstr "_Zakazano"
+msgstr "_Zakazivanje"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
-msgstr "Zakazuje novi sastanak"
+msgstr "Pravi novo zakazivanje"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
-msgstr "Pravi novi celodnevni sastanak"
+msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
@@ -5619,13 +4121,16 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "MeseÄ?ni pregled"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Bilo koje polje"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Prilozi"
 
@@ -5635,60 +4140,83 @@ msgstr "Prilozi"
 msgid "Attendee"
 msgstr "_UÄ?esnik"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "Razvrstavanje"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370
+#: ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/caltypes.xml.h:8
+#: ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Opisi"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Ne postoji"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Postoji"
 
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Mesto"
+
 #: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368
+#: ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "LiÄ?no"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359
+#: ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Javno"
 
@@ -5698,66 +4226,97 @@ msgid "Recurrence"
 msgstr "UÄ?estalost"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
-msgstr "Pregled"
+msgstr "Sažetak"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
-msgstr "Pregledi"
+msgstr "Sažetak sadrži"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "sadrži"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "je"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "nije"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Greška pri otvaranju kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Metod nije podržan pri otvaranju kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:607
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Navij sat"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "IskaÄ?uÄ?e upozorenje"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Pušta zvuk"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "PokreÄ?e program"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Å alje elektronsku poruku"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
-msgstr "<b>Podešavanja</b>"
+msgstr "<b>Opcije</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
@@ -5780,84 +4339,78 @@ msgid "Mes_sage:"
 msgstr "Po_ruka:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Pušta zvuk"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "IskaÄ?uÄ?e upozorenje"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "PokreÄ?e program"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Izaberite datoteku"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Pošalji:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Å alje elektronsku poruku"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "Po_novi alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Zvuk:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "posle"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "pre"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "dan(i)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "kraj sastanka"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"pre\n"
+"posle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
-msgstr "pokaži još na svakih"
+msgstr "prikaži još na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "sat(i)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minut(i)\n"
+"sat(i)\n"
+"dan(i)"
 
-# bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "minut(i)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minuti\n"
+"sati\n"
+"dani"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "poÄ?etak zakazanog sastanka"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#| msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"zakazani poÄ?etak\n"
+"zakazani kraj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5868,17 +4421,18 @@ msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Predloži automatski prikaz priloga"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Prilaže datoteku(e)"
 
@@ -5888,35 +4442,47 @@ msgstr "Prilaže datoteku(e)"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150
+#: ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717
+#: ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435
+#: ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312
+#: ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Ništa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za koje zvoni sat"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#| msgid "Time zone:"
+msgid "Time and date:"
+msgstr "Vreme i datum:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#| msgid "Date:"
+msgid "Date only:"
+msgstr "Samo datum:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
-msgstr ""
+msgstr "(Prikazano u Dnevnom pregledu)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
@@ -5934,58 +4500,67 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u i %d Ä?e biti zamenjeni korisnikom i domenom iz elektronske adrese.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u i %d Ä?e biti zamenjeni korisnikom i domenom iz elektronske adrese.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+#| msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Alarmi</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Upozorenja</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+#| msgid "<span weight=\"bold\">Time</span>"
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Format datum/vreme</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr ""
-"<span weight=\"bold\">Podrazumevani server slobodnog/zauzetog vremena</span>"
+msgstr "<span weight=\"bold\">Podrazumevani server slobodnog/zauzetog vremena</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Opšte</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">Spisak zaduženja</span>"
+msgstr "<span weight=\"bold\">Spisak zadataka</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Vreme</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Radna sedmica</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Podesi za _letnje raÄ?unanje vremena"
+msgstr "<span weight=\"bold\">Radna nedelja</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Prikaz"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#| msgid "Show display alarms in notification tray"
+msgid "Display alarms in _notification area only"
+msgstr "Prikazuje alarme samo u _obaveštajnoj zoni"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5995,13 +4570,13 @@ msgstr ""
 "Sati\n"
 "Dana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -6019,218 +4594,234 @@ msgstr ""
 "Subota\n"
 "Nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Bira boju"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "N_ed"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "Pri_kazuje MeseÄ?ni pregled po nedeljama"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
-msgstr ""
+msgstr "Dru_ga zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Izaberi kalendare za zvuÄ?no obaveÅ¡tenje"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Pri_kaži podsetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
-msgstr "Pri_kaži podsetnik"
+msgstr "Prikaži _podsetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Prikaži _brojeve nedelja u delu za datum"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
-msgstr "Prikazuje brojeve nedelja u delu za datum"
+msgstr "Prikazuje _broj nedelje u pregledu za dan i radnu nedelju"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
-msgstr "Z_aduženja za danas:"
+msgstr "Z_adaci za danas:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "U_to"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Model:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Ä?etvrtak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#| msgid "Show the second time zone"
+msgid "Use s_ystem time zone"
+msgstr "Koristi vremensku zonu _sistema"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Sreda"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "PoÄ?etak n_edelje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - Ä?asovni (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 - Ä?asovni"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
-msgstr "_Traži potvrdu za brisanje predmeta"
+msgstr "_Traži potvrdu za brisanje stavki"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Sažmi nedelje u meseÄ?ni pregled"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "PoÄ?etak _dana:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
-msgstr "_Sakrij završena zaduženja posle"
+msgstr "_Sakrij završene zadatke posle"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
-msgstr "_Neispunjena zaduženja:"
+msgstr "_Neispunjeni zadaci:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
-msgstr "_Prikaži vremena zavrÅ¡etka sastanaka u nedeljnim i meseÄ?nim pregledima"
+msgstr "_Prikaži zakazana vremena zavrÅ¡etka u nedeljnim i meseÄ?nim pregledima"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "Podele _vremena:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Uto"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Sre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
-msgstr ""
+msgstr "pre svake godiÅ¡njice/roÄ?endana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
-msgstr "pre svakog sastanka"
+msgstr "pre svakog zakazivanja"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Tip:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Umnožava sadržaj kalendara lokalno za rad van mreže"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
-msgstr "_Umnožava sadržaj liste zaduženja lokalno za rad van mreže"
+msgstr "_Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_Umnožava sadržaj spiska beleški lokalno za rad van mreže"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Boj_a:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
-msgstr "Spisak zaduženja"
+msgstr "Spisak zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Spisak beleški"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
-msgstr "Osobine liste zaduženja"
+msgstr "Osobine spiska zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
-msgstr "No_vi spisak zaduženja"
+msgstr "No_vi spisak zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
-msgstr "Osobine liste zaduženja"
+msgstr "Osobine spiska zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
-msgstr "Novi spisak beleški"
+msgstr "Novi spisak zadataka"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -6238,7 +4829,7 @@ msgstr "Ovaj dogaÄ?aj je obrisan."
 
 #: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
-msgstr "Ovo zaduženje je obrisano."
+msgstr "Ovaj zadatak je obrisan."
 
 #: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
@@ -6260,7 +4851,7 @@ msgstr "Ovaj dogaÄ?aj je promenjen."
 
 #: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
-msgstr "Ovo zaduženje je promenjeno."
+msgstr "Ovaj zadatak je promenjen."
 
 #: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
@@ -6281,300 +4872,249 @@ msgstr "%s  Niste naÄ?inili promene, osvežiti ureÄ?ivaÄ??"
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189
+#: ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " za "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195
+#: ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202
+#: ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Priložena poruka - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d priložena poruka"
-msgstr[1] "%d priložene poruke"
-msgstr[2] "%d priloženih poruka"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "Pre_mesti"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+#| msgid "Save attachments"
+msgid "Could not save attachments"
+msgstr "Nije moguÄ?e saÄ?uvati priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Otkaži _prevlaÄ?enje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:456
-msgid "attachment"
-msgstr "prilog"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Nije moguÄ?e osvežiti objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
-msgstr "Uredi zakazani sastanak"
+msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
-msgstr "Zakazani sastanak - %s"
+msgstr "Zakazivanje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Dodeljeno zaduženje - %s"
+msgstr "Dodeljen zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
-msgstr "Zaduženje - %s"
+msgstr "Zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Beleška - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
-msgstr "Bez pregleda"
+msgstr "Bez sažetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
-msgstr ""
+msgstr "Zadržati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Pritisnite ovde da zatvorite tekuÄ?i prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Umnoži izabrani tekst u spisak iseÄ?aka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "SeÄ?e izabrani tekst u spisak iseÄ?aka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Pritisnite ovde za dostupnu pomoÄ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "Ubaci tekst iz liste iseÄ?aka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Pritisnite ovde da saÄ?uvate tekuÄ?i prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Izaberi sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "Ozna_ka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_PomoÄ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
-msgstr "_MoguÄ?nosti"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+msgstr "_Opcije"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../mail/em-folder-tree.c:2106
+#: ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
-msgstr "Pritisnite ovde da priložite neki dokument"
+msgstr "Pritisnite ovde da priložite dokument"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "Ka_tegorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "Bira da li da prikaže kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "Bira da li da prikaže vremensku zonu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "OznaÄ?i kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "L_iÄ?no"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "OznaÄ?i kao liÄ?no"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "OznaÄ?i kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "_Uloga polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "Bira da li je polje Uloga prikazano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Bira da li je polje RSVP prikazano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "_Stanje polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
-msgstr "Bira da li da prikaže polje sa stanjem"
+msgstr "Bira da li da prikaže polje statusa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
-msgstr "_Vrsta polje"
+msgstr "_Tip polja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Bira da li je prikazana vrsta prisutnih"
+msgstr "Bira da li je prikazan tip prisutnih"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "Skorašnji _dokumenti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> prilog"
-msgstr[1] "<b>%d</b> priloga"
-msgstr[2] "<b>%d</b> priloga"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "Sakrij liniju pri_loga"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "Prikaži liniju p_riloga"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_Dodaj prilog..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "Prikaži p_riloge"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "Pritisnite razmak za prikaz(sakrivanje) linije priloga"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "SaÄ?uvaj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Promene naÄ?injene na ovom predmetu mogu biti zanemarene ako bude osvežen"
+msgstr "Promene naÄ?injene na ovoj stavki mogu biti zanemarene ako bude ažurirano"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2801
+#: ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "Nije moguÄ?e koriÅ¡Ä?enje tekuÄ?e verzije!"
 
@@ -6600,7 +5140,7 @@ msgstr "DogaÄ?aj nije mogao biti obrisan zbog corba greÅ¡ke"
 
 #: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
-msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
+msgstr "Zadatak nije mogao biti izbrisan zbog corba greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
@@ -6608,7 +5148,7 @@ msgstr "Beleška nije moglo biti obrisana zbog corba greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
-msgstr "Predmet nije mogao biti obrisan zbog corba greške"
+msgstr "Stavka nije mogla biti obrisana zbog corba greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
@@ -6616,7 +5156,7 @@ msgstr "DogaÄ?aj nije mogao biti obrisan jer pristup nije dozvoljen"
 
 #: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
-msgstr "Zaduženje nije moglo biti obrisano jer pristup nije dozvoljen"
+msgstr "Zadatak nije mogao biti obrisan jer pristup nije dozvoljen"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
@@ -6624,7 +5164,7 @@ msgstr "Beleška nije mogla biti obrisana jer pristup nije dozvoljen"
 
 #: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
-msgstr "Predmet nije mogao biti obrisan jer pristup nije dozvoljen"
+msgstr "Stavka nije mogla biti obrisana jer pristup nije dozvoljen"
 
 #: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
@@ -6632,7 +5172,7 @@ msgstr "DogaÄ?aj nije mogao biti obrisan usled greÅ¡ke"
 
 #: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
-msgstr "Zaduženje nije moglo biti obrisano usled greške"
+msgstr "Zadatak nije mogao biti obrisan usled greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
@@ -6640,16 +5180,16 @@ msgstr "Beleška nije mogla biti obrisana usled greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
-msgstr "Predmet nije mogao biti obrisan usled greške"
+msgstr "Stavka nije mogla biti obrisana usled greške"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Kontakti..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
-msgstr "Delegiraj:"
+msgstr "Delegiraj na:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
@@ -6661,27 +5201,27 @@ msgstr "Ala_rmi"
 
 #: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
-msgstr "Pritisnite ovde da navijete ili iskljuÄ?ite sat za ovaj dogaÄ?aj"
+msgstr "Pritisnite ovde da postavite ili iskljuÄ?ite alarm za ovaj dogaÄ?aj"
 
 #: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
-msgstr "UÄ?esta_lost"
+msgstr "_Ponavljanje"
 
 #: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
-msgstr "Neka ova pojava bude pokretna"
+msgstr "Neka se ovaj dogaÄ?aj ponavlja"
 
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Opcije slanja"
 
 #: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
-msgstr "Umetni napredne moguÄ?nosti slanja"
+msgstr "Umetni napredne opcije slanja"
 
 #: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
@@ -6689,7 +5229,7 @@ msgstr "Celodnevni dogaÄ?a_j"
 
 #: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
-msgstr "Bira da li dozvoliti celodnevne dogaÄ?aje"
+msgstr "Bira da li dozvoljava celodnevne dogaÄ?aje"
 
 #: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
@@ -6709,205 +5249,242 @@ msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove uÄ?esnike"
 
 #: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
-msgstr "Zaka_zani sastanak"
+msgstr "Zakaza_no"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "DogaÄ?aj nije moguÄ?e ureÄ?ivati, poÅ¡to je izabrani kalendar samo za Ä?itanje"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "DogaÄ?aj nije moguÄ?e potpuno urediti, poÅ¡to niste organizator"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
-msgstr "Za ovaj dogaÄ?aj je navijen sat"
+msgstr "Ovaj dogaÄ?aj ima alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "UÄ?_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "DogaÄ?aj bez datuma poÄ?etka"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "DogaÄ?aj bez datuma zavrÅ¡etka"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "Datum poÄ?etka je pogreÅ¡an"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Vreme poÄ?etka je pogreÅ¡no"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan uÄ?esnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Dodaj "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Nije moguÄ?e otvaranje kalendara â??%sâ??."
-
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+msgstr "Nije moguÄ?e otvaranje kalendara â??%sâ??."
+
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Delujete u ime %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "%d dan pre zakazanog sastanka"
-msgstr[1] "%d dana pre zakazanog sastanka"
-msgstr[2] "%d dana pre zakazanog sastanka"
+msgstr[0] "%d dan pre zakazanog"
+msgstr[1] "%d dana pre zakazanog"
+msgstr[2] "%d dana pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "%d sat pre zakazanog sastanka"
-msgstr[1] "%d sata pre zakazanog sastanka"
-msgstr[2] "%d sati pre zakazanog sastanka"
+msgstr[0] "%d sat pre zakazanog"
+msgstr[1] "%d sata pre zakazanog"
+msgstr[2] "%d sati pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minut pre zakazanog sastanka"
-msgstr[1] "%d minuta pre zakazanog sastanka"
-msgstr[2] "%d minuta pre zakazanog sastanka"
+msgstr[0] "%d minut pre zakazanog"
+msgstr[1] "%d minuta pre zakazanog"
+msgstr[2] "%d minuta pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Prilagodi"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "1 dan pre zakazanog sastanka"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "1 sat pre zakazanog sastanka"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minuta pre zakazanog sastanka"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 minuta pre zakazanog\n"
+"1 sat pre zakazanog\n"
+"1 dan pre zakazanog"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "UÄ?_esnici..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Custom Alarm:"
-msgstr "PrilagoÄ?en zvuk alarma:"
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "UÄ?esnici"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "PrilagoÄ?en alarm:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Opis dogaÄ?aja"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
-msgstr "U kratkim crtama:"
+msgstr "Saže_tak:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Opis:"
 
-# note(slobo): možda treba rok
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Lokacija:"
+
+# note(slobo): možda treba rok
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Vreme:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "za"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "do"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>UÄ?esni_ci</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "_Promeni organizatora"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Konta_kti..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Organizator:"
+#| msgid "until"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"za\n"
+"do"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111
+#: ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "BeleÅ¡ku nije moguÄ?e ureÄ?ivati, poÅ¡to je izabran spisak samo za Ä?itanje"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "BeleÅ¡ku nije moguÄ?e potpuno urediti, poÅ¡to niste organizator"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nije moguÄ?e otvaranje beleÅ¡ki u â??%sâ??."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031
+#: ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624
+#: ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78
+#: ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Prima"
 
@@ -6921,7 +5498,7 @@ msgid "T_o:"
 msgstr "_Prima:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupa:"
@@ -6929,43 +5506,42 @@ msgstr "_Grupa:"
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Menjate povratni dogaÄ?aj, Å¡ta želite da izmenite?"
+msgstr "Menjate povratni dogaÄ?aj. Å ta želite da izmenite?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Delegirate povratni dogaÄ?aj, Å¡ta želite da delegirate?"
+msgstr "Delegirate povratni dogaÄ?aj. Å ta želite da delegirate?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Menjate povratno zaduženje, šta želite da izmenite?"
+msgstr "Menjate povratni zadatak. Šta želite da izmenite?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Ovaj i buduÄ?e unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Ovaj zakazani sastanak sadrži ponavljanja koja Evolucija ne može da uredi."
+msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
@@ -6973,7 +5549,7 @@ msgstr "Datum ponavljanja nije ispravan"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
-msgstr ""
+msgstr "Vreme zavrÅ¡etka ponavljanja je ispred poÄ?etka dogaÄ?aja"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
@@ -6985,7 +5561,7 @@ msgstr "na"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "prvoj"
 
@@ -6994,7 +5570,7 @@ msgstr "prvoj"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "drugoj"
 
@@ -7002,7 +5578,7 @@ msgstr "drugoj"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "treÄ?oj"
 
@@ -7010,21 +5586,30 @@ msgstr "treÄ?oj"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "Ä?etvrtoj"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#| msgid "Width"
+msgid "fifth"
+msgstr "peti"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "poslednjoj"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -7032,7 +5617,7 @@ msgstr "Drugi datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -7040,7 +5625,7 @@ msgstr "od prvog do desetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -7048,45 +5633,45 @@ msgstr "od jedanaestog do dvadesetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "dan"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Ne može da naÄ?e izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Izmeni izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Ne može da naÄ?e izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -7095,7 +5680,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Izuzeci</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Pregled</b>"
 
@@ -7103,52 +5688,59 @@ msgstr "<b>Pregled</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Ponavljanje</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Svakih"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
-msgstr "Ovaj sastanak se po_navlja"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "uvek"
+msgstr "Ovo zakazivanje se po_navlja"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "mesec(i)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"dan(i)\n"
+"nedelja(e)\n"
+"mesec(i)\n"
+"godina(e)"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "nedelja(e)"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "godina(e)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"za\n"
+"do\n"
+"zauvek"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
-msgstr ""
+msgstr "PoÅ¡alji moje alarme sa ovim dogaÄ?ajem"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+#| msgid "Notify new messages for _Inbox only"
+msgid "Notify new attendees _only"
+msgstr "Obavesti _samo nove uÄ?esnike"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
-msgstr "Veb strana"
+msgstr "Veb stranica"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
@@ -7158,75 +5750,38 @@ msgstr "<span weight=\"bold\">Razno</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
-# timezone.
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "Završeno"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "Visoka"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "U toku"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"Visoko\n"
+"Normalno\n"
+"Nisko\n"
+"NeodreÄ?eno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Mala"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "ObiÄ?na"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Nije zapoÄ?eto"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"Nije zapoÄ?eto\n"
+"U toku\n"
+"Završeno\n"
+"Otkazano"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "P_rocenat završenog:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "_Stanje:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "NeodreÄ?ena"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Datum završetka:"
@@ -7242,38 +5797,48 @@ msgstr "_Veb stranica:"
 
 #: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
-msgstr "Det_alji stanja"
+msgstr "Det_alji statusa"
 
 #: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
-msgstr "Klikni za promenu ili detaljan pregled stanja zaduženja"
+msgstr "Klikni za promenu ili detaljan pregled statusa zadatka"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "Mog_uÄ?nosti kod slanja"
 
 #: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
-msgstr "_Zaduženje"
+msgstr "_Zadatak"
 
 #: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
-msgstr "Detalji zaduženja"
+msgstr "Detalji zadatka"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Zadatak nije moguÄ?e ureÄ?ivati, poÅ¡to je izabrani spisak samo za Ä?itanje"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Zadatak nije moguÄ?e potpuno urediti, poÅ¡to niste organizator"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Nije moguÄ?e otvaranje zaduženja u â??%sâ??."
+msgstr "Nije moguÄ?e otvaranje zadatka u â??%sâ??."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
@@ -7318,42 +5883,42 @@ 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 poÄ?etka sastanka"
+msgstr "%s %s pre zakazanog poÄ?etka"
 
 #. 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 poÄ?etka sastanka"
+msgstr "%s %s nakon zakazanog poÄ?etka"
 
 #. 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 poÄ?etku sastanka"
+msgstr "%s na zakazanom poÄ?etku"
 
 #. 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 kraja sastanka"
+msgstr "%s %s pre zakazanog kraja"
 
 #. 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 završetka sastanka"
+msgstr "%s %s nakon zakazanog završetka"
 
 #. 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 kraju sastanka"
+msgstr "%s na zakazanom kraju"
 
 #. 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"
@@ -7369,80 +5934,180 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretaÄ?a"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#| msgid "Import"
+msgid "I_mport"
+msgstr "U_vezi"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#| msgid "Select Calendar"
+msgid "Select a Calendar"
+msgstr "Izaberite kalendar"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#| msgid "Select Task List"
+msgid "Select a Task List"
+msgstr "Izaberite spisak zadataka"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#| msgid "Import to Calendar"
+msgid "I_mport to Calendar"
+msgstr "U_vezi u kalendar"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+#| msgid "_Import to Tasks"
+msgid "I_mport to Tasks"
+msgstr "U_vezi u zadatke"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67
+#: ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Pritisnite da otvorite %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170
+#: ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Datum poÄ?etka:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
-msgstr "Pregled:"
+msgstr "Sažetak:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Datum za završetak:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
-msgstr "Stanje:"
+msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659
+#: ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "U toku"
+
+# timezone.
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660
+#: ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Završeno"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658
+#: ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Nije zapoÄ?eto"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Važnost:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Visoka"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076
+#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "ObiÄ?na"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Mala"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Napravljeno"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Datum završetka"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#| msgid "Modified"
+msgid "Last modified"
+msgstr "Poslednje menjano"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Datum poÄ?etka"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7452,228 +6117,226 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027
+#: ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027
+#: ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372
+#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995
+#: ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:827
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Ponovno"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "SaÄ?uvaj kao..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "Izaberite fasciklu za Ä?uvanje izabranih priloga..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "neimenovana_slika.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_SaÄ?uvaj kao..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Postavi kao _pozadinu"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_SaÄ?uvaj izabrano"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "Otvori u %s..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
-msgstr "* Bez pregleda *"
+msgstr "* Bez sažetka *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "PoÄ?etak:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "Do: "
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "NeodreÄ?ena"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659
+#: ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Brisanje izabranih objekata"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873
+#: ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
-msgstr "Osvežavanje objekata"
+msgstr "Ažuriranje objekata"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333
+#: ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "SaÄ?uvaj kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
-msgstr "Novo zad_uženje"
+msgstr "Novi zad_atak"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807
+#: ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "_SaÄ?uvaj kao..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "Å _tampaj..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812
+#: ../calendar/gui/e-memo-table.c:939
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
+#: ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iseci"
 
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814
+#: ../calendar/gui/e-memo-table.c:941
+#: ../ui/evolution-addressbook.xml.h:57
+#: ../ui/evolution-calendar.xml.h:46
+#: ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "U_baci"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
-msgstr "_Dodeli zaduženje"
+msgstr "_Dodeli zadatak"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iKalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
-msgstr "_Obeleži kao završeno"
+msgstr "_OznaÄ?i kao zavrÅ¡eno"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
-msgstr "_Obeleži izabrana zaduženja kao završena"
+msgstr "_OznaÄ?i izabrane zadatke kao zavrÅ¡ene"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
-msgstr "_Obeleži kao nezavršeno"
+msgstr "_OznaÄ?i kao nezavrÅ¡eno"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Obeleži izabrana zaduženja kao nezavršena"
+msgstr "_OznaÄ?i izabrane zadatke kao nezavrÅ¡ene"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
-msgstr "_Obriši izabrana zaduženja"
+msgstr "_Obriši izabrane zadatke"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
-msgstr "Kliknite za novo zaduženje"
+msgstr "Kliknite za novi zadatak"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -7688,152 +6351,161 @@ msgstr "Završeno"
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Datum za završetak"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Važnost"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Datum poÄ?etka"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
-msgstr "Premeštanje predmeta"
+msgstr "Premeštanje stavki"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
-msgstr "Umnožavanje predmeta"
+msgstr "Umnožavanje stavki"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
-msgstr "Novi _sastanak..."
+msgstr "Novo _zakazivanje..."
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
-msgstr "Nov celodnevni _dogaÄ?aj"
+msgstr "Novi celodnevni _dogaÄ?aj"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "Novi _sastanak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "_Trenutni pregled"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Izaberi datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "Å tam_paj..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "O_dgovori"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140
+#: ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../calendar/gui/e-calendar-view.c:1838
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "PrihvaÄ?eno"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-calendar-view.c:2294
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -7843,7 +6515,7 @@ msgstr "Vreme: %s %s"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -7852,11 +6524,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7869,12 +6541,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "Prikaži drugu vremensku zonu"
 
@@ -7889,34 +6561,38 @@ 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:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840
+#: ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359
+#: ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:805
+#: ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:808
+#: ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2321
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeno ponavljanje)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7924,7 +6600,7 @@ msgstr[0] "Svaki %d dan"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7932,7 +6608,7 @@ msgstr[0] "Svake %d nedelje"
 msgstr[1] "Svake %d nedelje"
 msgstr[2] "Svakih %d nedelja"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7941,22 +6617,22 @@ msgstr[1] "Svake %d nedelje u "
 msgstr[2] "Svakih %d nedelja u "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " i "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan od "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s od "
 
 # sliÄ?no kao za nedelje
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7965,7 +6641,7 @@ msgstr[1] "svaka %d meseca"
 msgstr[2] "svakih %d meseci"
 
 # sliÄ?no kao za mesece i nedelje
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7973,7 +6649,7 @@ msgstr[0] "Svake %d godine"
 msgstr[1] "Svake %d godine"
 msgstr[2] "Svakih %d godina"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7982,36 +6658,39 @@ msgstr[1] "ukupno %d puta"
 msgstr[2] "ukupno %d puta"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", zavrÅ¡avajuÄ?i se "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "PoÄ?inje"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Završava se"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Rok"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995
+#: ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iKalendar podaci"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iKalendar greška"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111
+#: ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -8022,288 +6701,285 @@ msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Proverite sledeÄ?i podatak, i potom izaberite radnju iz donjeg menija."
+#: ../calendar/gui/e-itip-control.c:1135
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Proverite sledeÄ?i podatak i potom izaberite radnju iz donjeg menija."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄ?eno s rezervom"
 
-#: ../calendar/gui/e-itip-control.c:1278
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
+#: ../calendar/gui/e-itip-control.c:1274
+msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "Sastanak je otkazan, meÄ?utim nije ga moguÄ?e naÄ?i u VaÅ¡im kalendarima"
 
-#: ../calendar/gui/e-itip-control.c:1280
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Zaduženje je otkazano, meÄ?utim nije ga moguÄ?e naÄ?i u VaÅ¡im spiskovima zaduženja"
+#: ../calendar/gui/e-itip-control.c:1276
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Zadatak je otkazan, meÄ?utim nije ga moguÄ?e naÄ?i u VaÅ¡im spiskovima zadataka"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> objavi podatak o sastanku."
+msgstr "<b>%s</b> objavljuje podatak o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Podatak o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva Vaše prisustvo na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> želi da bude deo postojeÄ?eg sastanka."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
-msgstr "Osvežavanje sastanka"
+msgstr "Ažuriranje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi da dobije najnovija obaveštenja o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
-msgstr "Zahtev za osvežavanjem sastanka"
+msgstr "Zahtev za ažuriranjem sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> odgovori na zahtev za sastanak."
+msgstr "<b>%s</b> odgovara na zahtev za sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> otkaza sastanak."
+msgstr "<b>%s</b> otkazuje sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Otkazivanje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> posla nerazumljivu poruku."
+msgstr "<b>%s</b> Å¡alje nerazumljivu poruku."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> objavi podatak o zaduženju."
+msgstr "<b>%s</b> objavljuje podatak o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
-msgstr "Podatak o zaduženju"
+msgstr "Podatak o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> traži %s za izvršavanje zaduženja."
+msgstr "<b>%s</b> traži %s za izvršavanje zadatka."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> traži da Vi izvršite zaduženje."
+msgstr "<b>%s</b> traži da Vi izvršite zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
-msgstr "Predlog za zaduženje"
+msgstr "Predlog za zadatak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b želi da bude deo postojeÄ?eg zaduženja."
+msgstr "<b>%s</b želi da bude deo postojeÄ?eg zadatka."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
-msgstr "Osvežavanje zaduženja"
+msgstr "Ažuriranje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> želi da prima najnovija obaveštenja o zaduženju."
+msgstr "<b>%s</b> želi da prima najnovija obaveštenja o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
-msgstr "Zahtev za osvežavanjem zaduženja"
+msgstr "Zahtev za ažuriranjem zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> odgovori na dodeljeno zaduženje."
+msgstr "<b>%s</b> odgovara na dodeljen zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
-msgstr "Odgovor na zaduženje"
+msgstr "Odgovor na zadatak"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> otkaza zaduženje."
+msgstr "<b>%s</b> otkazuje zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
-msgstr "Otkazivanje zaduženja"
+msgstr "Otkazivanje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
-msgstr "Loša poruka o zaduženju"
+msgstr "Loša poruka o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> objavi slobodno/zauzeto vreme."
+msgstr "<b>%s</b> objavljuje slobodno/zauzeto vreme."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Slobodno/zauzeto vreme"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pita kada ste slobodni/zauzeti."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Slobodno/zauzeto zahtev"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> odgovori na slobodno/zauzeto zahtev."
+msgstr "<b>%s</b> odgovara na slobodno/zauzeto zahtev."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Slobodno/zauzeto odgovor"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodno/zauzeto poruka"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
-msgstr "Poruka izgleda da nije ispravno saÄ?injena"
+msgstr "Izgleda da poruka nije ispravno saÄ?injena"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
-msgstr "Prilog nema predmete kalendara koji se mogu pregledati"
+msgstr "Prilog nema stavke kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
-msgstr "Osvežavanje završeno\n"
+msgstr "Ažuriranje završeno\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
-msgstr "Objekat nije ispravan i ne može biti osvežen\n"
+msgstr "Objekat nije ispravan i ne može biti ažuriran\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan uÄ?esnik.  Dodati ga u prisutne?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Stanje uÄ?esnika nije osveženo jer nema ispravano stanje!\n"
+msgstr "Status uÄ?esnika nije ažuriran jer nema ispravan status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
-msgstr "Osvežen status uÄ?esnika\n"
+msgstr "Ažuriran status uÄ?esnika\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Stanje uÄ?esnika nije osveženo jer predmet viÅ¡e ne postoji"
+msgstr "Status uÄ?esnika nije osvežen jer stavka viÅ¡e ne postoji"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098
+#: ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
-msgstr "Predmet poslat!\n"
+msgstr "Stavka poslata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
-msgstr "Predmet nije mogao biti poslat!\n"
+msgstr "Stavka nije mogla biti poslata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Izaberite radnju:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
-msgstr "Osveži"
+msgstr "Ažuriraj"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodno/zauzeto podatak"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Osveži status sagovornika"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviji podatak"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr "Poništi"
+msgstr "Otkaži"
 
 #: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
@@ -8325,6 +7001,10 @@ msgstr "UÄ?itavanje kalendara"
 msgid "Loading calendar..."
 msgstr "UÄ?itavanje kalendara..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Poruka servera:"
@@ -8345,78 +7025,87 @@ msgstr "MoguÄ?i uÄ?esnici"
 msgid "Resources"
 msgstr "Izvori"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "UÄ?esnici"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84
+#: ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736
+#: ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Pojedinac"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975
+#: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupa"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88
+#: ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Izvor"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90
+#: ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Soba"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
-msgstr "Mesto"
+msgstr "Stolica"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739
+#: ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Obavezan uÄ?esnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "MoguÄ?i uÄ?esnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125
+#: ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ne-uÄ?esnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "UÄ?esnik"
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "U toku"
 
 # %B = full month name, %d = month day, %Y = full year.
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -8429,8 +7118,8 @@ msgstr "%A, %d %B , %Y."
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
@@ -8441,71 +7130,71 @@ msgstr "%a %d. %m. %Y."
 # %d = day of month, %Y = year (all digits).
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "UÄ?_esnici..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "O_pcije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
-msgstr "_Osveži slobodno/zauzeto"
+msgstr "_Ažuriraj slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_Vreme poÄ?etka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
@@ -8533,15 +7222,17 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Ä?lan"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_Obriši izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pritisnite da dodate belešku"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754
+#: ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8550,37 +7241,38 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "UÄ?itavanje beleÅ¡ki je u toku"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Otvaranje beleški sa %s je u toku"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066
+#: ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Brisanje izabranih objekata..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
-msgstr "UÄ?itavanje zaduženja"
+msgstr "UÄ?itavanje zadataka"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "Otvaranje zaduženja u %s"
+msgstr "Otvaranje zadataka u %s"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
-msgstr "Završavanje zaduženja..."
+msgstr "Završavanje zadataka..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Izaberite vremensku zonu"
 
@@ -8589,128 +7281,114 @@ msgstr "Izaberite vremensku zonu"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376
+#: ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "Pr_ilagoÄ?en pregled"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "SaÄ?uvaj prilagoÄ?en preg_led"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "Odre_di preglede..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
-msgstr "UÄ?itavanje sastanaka sa %s"
+msgstr "UÄ?itavanje zakazivanja sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
-msgstr "UÄ?itavanje zaduženja sa %s"
+msgstr "UÄ?itavanje zadataka sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "UÄ?itavanje beleÅ¡ki na %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaranje %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "Brisanje"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Avgust"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Decembar"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Februar"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Januar"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Jul"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Jun"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Mart"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Maj"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Novembar"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Oktobar"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"Januar\n"
+"Februar\n"
+"Mart\n"
+"April\n"
+"Maj\n"
+"Jun\n"
+"Jul\n"
+"Avgust\n"
+"Septembar\n"
+"Oktobar\n"
+"Novembar\n"
+"Decembar"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Izaberite datum"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "Septembar"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Izaberi današnji dan"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410
+#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Organizator mora biti odreÄ?en."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan uÄ?esnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Podatak o dogaÄ?aju"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637
+#: ../calendar/gui/itip-utils.c:784
 msgid "Task information"
-msgstr "Podatak o zaduženju"
+msgstr "Podatak o zadatku"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639
+#: ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
-msgstr "Podaci o beleški"
+msgstr "Podaci o belešci"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641
+#: ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Slobodno/zauzeto podatak"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Podatak o kalendaru"
 
@@ -8718,7 +7396,7 @@ msgstr "Podatak o kalendaru"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "PrihvaÄ?eno"
@@ -8727,7 +7405,7 @@ msgstr "PrihvaÄ?eno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄ?eno s rezervom"
@@ -8739,7 +7417,8 @@ msgstr "PrihvaÄ?eno s rezervom"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691
+#: ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -8748,7 +7427,7 @@ msgstr "Odbijeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -8756,7 +7435,7 @@ msgstr "Delegirano"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -8764,15 +7443,15 @@ msgstr "Osveženo"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
-msgstr "Poništi"
+msgstr "Otkaži"
 
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -8780,29 +7459,29 @@ msgstr "Osveži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodno/zauzeto vreme (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iKalendar podatak"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Morate biti uÄ?esnik dogaÄ?aja."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8810,7 +7489,8 @@ msgstr[0] "%d beleška"
 msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562
+#: ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8818,403 +7498,391 @@ msgstr[0] ", %d izabrano"
 msgstr[1] "%d izabrana"
 msgstr[2] "%d izabranih"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
-msgstr "Neuspela dopuna beleški."
+msgstr "Neuspela dogradnja beleški."
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Nije moguÄ?e otvaranje spiska beleÅ¡ki â??%sâ?? za pravljenje dogaÄ?aja i sastanaka"
+msgstr "Nije moguÄ?e otvaranje spiska beleÅ¡ki â??%sâ?? za pravljenje dogaÄ?aja i sastanaka"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Nijedan kalendar nije dostupan za pravljenje beleški"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "BiraÄ? izvora beleÅ¡ki"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Nova beleška"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Napiši jednu novu belešku"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Nova deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Napravi nobu deljenu belešku"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Spi_sak beleški"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Sastavi novi spisak beleški"
 
-#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405
+#: ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mesto i hijerarhija fascikli zaduženja u Evoluciji je izmenjena od Evolucije 1."
-"h.\n"
+"Mesto i hijerarhija fascikli zaduženja u Evoluciji je izmenjena od Evolucije 1.h.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
 #: ../calendar/gui/migration.c:161
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mesto i hijerarhija fascikli kalendara u Evoluciji je izmenjena od Evolucije "
-"1.h.\n"
+"Mesto i hijerarhija fascikli kalendara u Evoluciji je izmenjena od Evolucije 1.h.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Nije moguÄ? prenos starih podeÅ¡avanja iz evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Nije moguÄ? prenos kalendara â??%sâ??"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nije moguÄ? prenos zaduženja â??%sâ??"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Napomene"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Ä?e"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
-msgstr "Zakazani sastanak"
+msgstr "Zakazivanje"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
-msgstr "Zaduženje"
+msgstr "Zadatak"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
-msgstr "Pregled: %s"
+msgstr "Sažetak: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "Prisutni:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Kontakti: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
-msgstr "No_vi spisak zaduženja"
+msgstr "No_vi spisak zadataka"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d zaduženje"
-msgstr[1] "%d zaduženja"
-msgstr[2] "%d zaduženja"
+msgstr[0] "%d zadatak"
+msgstr[1] "%d zadataka"
+msgstr[2] "%d zadataka"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
-msgstr "Neuspela dopuna zaduženja."
+msgstr "Neuspela dogradnja zadataka."
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Nije moguÄ?e otvaranje liste zaduženja â??%sâ?? za pravljenje dogaÄ?aja i sastanaka"
+msgstr "Nije moguÄ?e otvaranje spiska zadataka â??%sâ?? za pravljenje dogaÄ?aja i sastanaka"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
-msgstr "Nijedan kalendar nije dostupan za pravljenje zaduženja"
+msgstr "Nijedan kalendar nije dostupan za pravljenje zadataka"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
-msgstr "BiraÄ? izvora zaduženja"
+msgstr "BiraÄ? izvora zadataka"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
-msgstr "Novo zaduženje"
+msgstr "Novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
-msgstr "_Zaduženje"
+msgstr "_Zadatak"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
-msgstr "Napravi novo zaduženje"
+msgstr "Napravi novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
-msgstr "Novo dodeljeno zaduženje"
+msgstr "Novi dodeljeni zadatak"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
-msgstr "Dodeljen_o zaduženje"
+msgstr "Dodeljen_i zadatak"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
-msgstr "Dodeli novo zaduženje"
+msgstr "Dodeli novi zadatak"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
-msgstr "Nova lista zaduženja"
+msgstr "Novi spisak zadataka"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
-msgstr "Lista zaduž_enja"
+msgstr "Spisak zada_taka"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
-msgstr "Sastavi novu listu zaduženja"
+msgstr "Napravi novi spisak zadataka"
 
-#: ../calendar/gui/tasks-control.c:488
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ova operacija Ä?e trajno obrisati sva zaduženja obeležena kao zavrÅ¡ena. Ako "
-"nastavite, neÄ?ete moÄ?i da povratite ova zaduženja.\n"
+"Ova operacija Ä?e trajno obrisati sve zadatke obeležene kao zavrÅ¡ene. Ako nastavite, neÄ?ete moÄ?i da povratite ove zadatke.\n"
 "\n"
-"Zaista obrisati ova zaduženja?"
+"Zaista obrisati ove zadatke?"
 
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487
+#: ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
+#: ../calendar/gui/tasks-control.c:524
+#: ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
-msgstr "Štampaj zaduženja"
+msgstr "Å tampaj zadatke"
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
@@ -9229,11 +7897,13 @@ msgstr "Otkazano"
 msgid "In progress"
 msgstr "U toku"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "je veÄ?e od"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "je manje od"
 
@@ -9241,37 +7911,37 @@ msgstr "je manje od"
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iKalendar datoteke (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolucija iKalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vKalendar datoteke (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolucija vKalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Kalendarski dogaÄ?aji"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolucija kalendar inteligentni uvoznik"
 
@@ -10826,263 +9496,261 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "Nije moguÄ?e otvoriti automatski saÄ?uvanu datoteku"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "Nije moguÄ?e vratiti poruku iz ureÄ?ivaÄ?a"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "Umetni prilog"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "Pri_loži"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
-msgstr "Priloži datoteku"
+msgstr "Prilaže datoteku"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322
+#: ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
-msgstr "Zatvori trenutnu datoteku"
+msgstr "Zatvara trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../composer/e-composer-actions.c:329
+#: ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58
+#: ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Å tam_paj..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:336
+#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_gled pred Å¡tampu"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
-msgstr "SaÄ?uvaj trenutnu datoteku"
+msgstr "Ä?uva trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "SaÄ?uvaj _kao..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
-msgstr "SaÄ?uvaj trenutnu datoteku pod drugim imenom"
+msgstr "Ä?uva trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
-msgstr "SaÄ?uvaj kao p_ripremu"
+msgstr "SaÄ?uvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
-msgstr "SaÄ?uvaj kao pripremu"
+msgstr "Ä?uva kao nacrt"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
-msgstr "Pošalji ovu poruku"
+msgstr "Å alje ovu poruku"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
-msgstr "Umetni opcije slanja"
+msgstr "UmeÄ?e opcije slanja"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "_Sigurnost"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP _Å¡ifruj"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
-msgstr "Å ifruj ovu poruku pomoÄ?u PGP-a"
+msgstr "Å ifruje ovu poruku pomoÄ?u PGP-a"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
-msgstr "PotpiÅ¡i ovu poruku pomoÄ?u PGP kljuÄ?a"
+msgstr "Potpisuje ovu poruku pomoÄ?u PGP kljuÄ?a"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
-msgstr "V_ažnosti poruke"
+msgstr "V_ažnost poruke"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
-msgstr "Postavi važnost poruke na visoko"
+msgstr "Postavlja važnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
-msgstr "T_raži priznanicu"
+msgstr "T_raži povratnicu"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
-msgstr "Primi izveÅ¡taj o dostavi kada je vaÅ¡a poruka proÄ?itana"
+msgstr "Prima izveÅ¡taj o dostavi kada je poruka proÄ?itana"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _Å¡ifruj"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Å ifruj ovu poruku pomoÄ?u S/MIME sertifikata za Å¡ifrovanje"
+msgstr "Å ifruje ovu poruku pomoÄ?u S/MIME sertifikata za Å¡ifrovanje"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Potpiši ovu poruku S/MIME sertifikatom"
+msgstr "Potpisuje ovu poruku S/MIME sertifikatom"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje BCC prikazano"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "Å _alje polje"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Bira da li je polje Å alje prikazano"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "_Pošalji polje"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Bira da li je polje Pošalji prikazano"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
-msgstr "Odgo_vor polje"
+msgstr "Odgo_vor-za polje"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Bira da li je polje Odgovor prikazano"
+msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "Polje za _temu"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Bira da li da prikaže polje za temu"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "_Prima polje"
+#: ../composer/e-composer-actions.c:521
+msgid "Save Draft"
+msgstr "SaÄ?uvaj nacrt"
 
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "Bira da li je polje Prima prikazano"
+#: ../composer/e-composer-header.c:120
+#| msgid "Sho_w: "
+msgid "Show"
+msgstr "Prikaži "
 
-#: ../composer/e-composer-actions.c:699
-msgid "Save Draft"
-msgstr "SaÄ?uvaj pripremu"
+#: ../composer/e-composer-header.c:123
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "Sakrij"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje Ä?e primiti kopiju (cc) poruke"
 
-#: ../composer/e-composer-header-table.c:69
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-"Unesite adrese koje Ä?e primiti kopiju poruke bez pojavljivanja u listi "
-"primalaca poruke"
+#: ../composer/e-composer-header-table.c:46
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "Unesite adrese koje Ä?e primiti kopiju poruke bez pojavljivanja u listi primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "Å _alje:"
 
+#: ../composer/e-composer-header-table.c:945
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923
+#: ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "Å alje"
+
 # *
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
-msgstr "_Odgovor:"
+msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Kopija (Cc):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Nevidljiva kopija (Bcc):"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "S_lanje na:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
-msgstr "Kliknite ovde za imenik."
+msgstr "Kliknite ovde za adresar."
 
 #: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
@@ -11096,65 +9764,38 @@ msgstr "Izaberite fascikle za slanje poruke."
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "Prikaži lini_ju priloga"
+#: ../composer/e-composer-private.c:208
+#| msgid "Save Draft"
+msgid "Save draft"
+msgstr "SaÄ?uvaj nacrt"
 
-#: ../composer/e-msg-composer.c:866
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Nije moguÄ?e potpisivanje odlazeÄ?e poruke: nije postavljen sertifikat za "
-"potpisivanje za ovaj nalog"
+#: ../composer/e-msg-composer.c:807
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Nije moguÄ?e potpisivanje odlazeÄ?e poruke: nije postavljen sertifikat za potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:873
-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:814
+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:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Prilog"
-msgstr[1] "Prilozi"
-msgstr[2] "Priloga"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "Sakrij li_niju priloga"
-
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1350
+#: ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4095
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr ""
-"<b>(SastavljaÄ? u telu poruke ne sadrži tekst, Å¡to ne može biti izmenjeno.)<b>"
+#: ../composer/e-msg-composer.c:3347
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(SastavljaÄ? u telu poruke ne sadrži tekst, Å¡to ne može biti izmenjeno.)<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Preuzima se nekoliko priloga. Ukoliko sada poÅ¡aljete poruku ovi prilozi neÄ?e "
-"biti poslati sa njom "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr " Preuzima se nekoliko priloga. Ukoliko sada poÅ¡aljete poruku ovi prilozi neÄ?e biti poslati sa njom "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Svi nalozi su uklonjeni."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "Sigurno želite da odbacite poruku, naslovljenu â??{0}â??, koju sastavljate?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -11171,14 +9812,8 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Zbog &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Zatvaranjem ovog prozora za sastavljanje Ä?ete trajno odbaciti poruku, osim ako "
-"odluÄ?ite da saÄ?uvate poruku u fasciklu Priprema. Ovo Ä?e Vam omoguÄ?iti da "
-"nastavite poruku kasnije."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Zatvaranjem ovog prozora za sastavljanje Ä?ete trajno odbaciti poruku, osim ako odluÄ?ite da saÄ?uvate poruku u fascikli Nacrti. Ovo Ä?e omoguÄ?iti da nastavite poruku kasnije."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
@@ -11218,20 +9853,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "GreÅ¡ka u Ä?uvanju samoÄ?uvajuÄ?e datoteke zbog &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolucija je neoÄ?ekivano zavrÅ¡ila tokom pisanja nove poruke. SpaÅ¡avanje poruke "
-"Ä?e Vam omoguÄ?iti da nastavite gde ste stali."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Evolucija je neoÄ?ekivano zavrÅ¡ila tokom pisanja nove poruke. SpaÅ¡avanje poruke Ä?e omoguÄ?iti da nastavite gde ste stali."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"Opcije slanja su dostupne samo za Novell GroupWise i Microsoft Exchange "
-"naloge."
+msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
+msgstr "Opcije slanja su dostupne samo za Novell GroupWise i Microsoft Exchange naloge."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -11242,19 +9869,14 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Datoteka â??{0}â?? nije regularna i ne može biti poslata u poruci."
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"Da priložite sadržaj ovog direktorijuma, ili priložite sve datoteke iz njega "
-"pojedinaÄ?no, ili napravite arhivu direktorijuma i priložite je."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "Da priložite sadržaj ovog direktorijuma, ili priložite sve datoteke iz njega pojedinaÄ?no, ili napravite arhivu direktorijuma i priložite je."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "Nije moguÄ?e pokretanje kontrole HTML ureÄ?ivaÄ?a.\n"
 "\n"
@@ -11294,36 +9916,84 @@ msgstr "Spa_si"
 
 #: ../composer/mail-composer.error.xml.h:33
 msgid "_Save Draft"
-msgstr "_SaÄ?uvaj pripremu"
+msgstr "_SaÄ?uvaj nacrt"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
-msgstr "Evolucijina pošta i kalendar"
+msgstr "Pošta i kalendar Evolucije"
 
 # bug(slobo): tooltip bi mogao da bude i â??PoÅ¡aljite e-poruku prijateljima i pored
 # ovako uštogljenih originala
 # msgstr "Paket poslovnih programa"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2
+#: ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
-msgstr "Pošaljite elektronsku poštu prijateljima i poslovnim saradnicima"
+msgstr "Paket Groupware"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "Manage your email, contacts and schedule"
-msgstr "Upravljajte poštom, kontaktima i zakazivanjima"
+msgstr "Upravlja poštom, kontaktima i obavezama"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
-msgstr "karta imenika"
+msgstr "karta adresara"
 
 #: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "podatak kalendara"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Danas"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200
+#: ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Sutra"
+
+#: ../e-util/e-datetime-format.c:202
+#| msgid "Yesterday %l:%M %p"
+msgid "Yesterday"
+msgstr "JuÄ?e"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr "%d dana od sada"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+#| msgid "1 day ago"
+#| msgid_plural "%d days ago"
+msgid "%d days ago"
+msgstr "pre %d dana"
+
+#: ../e-util/e-datetime-format.c:281
+#: ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+#| msgid "_Use system defaults"
+msgid "Use locale default"
+msgstr "Koristi podrazumevan lokalitet"
+
+#: ../e-util/e-datetime-format.c:494
+#| msgid "Format"
+msgid "Format:"
+msgstr "Format:"
+
+#: ../e-util/e-error.c:78
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Greška Evolucije"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-error.c:80
+#: ../e-util/e-error.c:81
+#: ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Upozorenje Evolucije"
 
@@ -11337,7 +10007,7 @@ msgstr "Upit Evolucije"
 
 # bug(slobo): mogli su dati i bolji original, dobili su isto tako smislen prevod
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "UnutraÅ¡nja greÅ¡ka, zahtevana je nepoznata greÅ¡ka â??%sâ??"
@@ -11350,70 +10020,74 @@ msgstr "Komponenta"
 msgid "Name of the component being logged"
 msgstr "Naziv komponente koji se beleži"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Dnevnici dijagnoze kvara"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
-msgstr "Prikaži u statusnoj liniji _greške za"
+msgstr "Prikaži u traci statusa _greške za"
 
 # bug: plural-forms
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "sekund(e)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "Unosi dnevnika:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "Nivo zapisivanja u dnevnik"
 
 # note(slobo): možda treba rok
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Vreme"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292
+#: ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Greška"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Greške"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Upozorenja i greške"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Dijagnoza kvara"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Poruke o grešci, upozorenju i dijagnozi kvara"
 
 # has "activatable" set.
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308
+#: ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477
+#: ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "OmoguÄ?eno"
 
@@ -11430,22 +10104,26 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Sistem za Å¡tampanje je izvestio sledeÄ?e detalje o greÅ¡ki:"
 
 #: ../e-util/e-print.c:173
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "Sistem za štampanje nije ponudio nikakve dodatne detalje o greški."
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "Automatski sastavljeno"
+
 # mail-composer:no-sig-file secondary
 # mail:no-create-tmp-path secondary
 # mail:no-delete-folder secondary
 # system:no-save-file secondary
 # system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Zbog â??{1}â??."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file \"{0}\"."
-msgstr "Ne mogu otvoriti datoteku â??{0}â??."
+msgstr "Nije moguÄ?e otvoriti datoteku â??{0}â??."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file \"{0}\"."
@@ -11463,24 +10141,25 @@ msgstr "Datoteka postoji â??{0}â??."
 msgid "Overwrite file?"
 msgstr "Prepisati datoteku?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
-msgstr "Ne mogu da otvorim vezu."
+msgstr "Nije moguÄ?e otvoriti vezu."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
-msgstr "Ne mogu da prikažem Evolucijinu pomoÄ?."
+msgstr "Nije moguÄ?e prikazati pomoÄ? za Evoluciju."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "Važ_no"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "Po_sao"
 
@@ -11488,52 +10167,50 @@ msgstr "Po_sao"
 # Create the default Person task list
 # orange
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "L_iÄ?no"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "Za uradi_ti"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "Kasni_je"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "Naziv _oznake:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "Uredi oznaku"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "Dodaj oznaku"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "Oznaka ne može biti bez naziva."
 
-#: ../e-util/e-util-labels.c:362
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
+#: ../e-util/e-util-labels.c:367
+msgid "A label having the same tag already exists on the server. Please rename your label."
 msgstr "Oznaka istoga naziva veÄ? postoji na serveru. Promenite ime oznaci."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf greška: %s"
 
-#: ../e-util/gconf-bridge.c:1232
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Sve greÅ¡ke se ubuduÄ?e prikazuju samo u terminalu."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11541,7 +10218,7 @@ msgstr[0] "pre %d sekunde"
 msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -11549,7 +10226,7 @@ msgstr[0] "%d sekunda u buduÄ?nosti"
 msgstr[1] "%d sekunde u buduÄ?nosti"
 msgstr[2] "%d sekundi u buduÄ?nosti"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11557,7 +10234,7 @@ msgstr[0] "pre %d minut"
 msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -11565,7 +10242,7 @@ msgstr[0] "%d minut u buduÄ?nosti"
 msgstr[1] "%d minuta u buduÄ?nosti"
 msgstr[2] "%d minuta u buduÄ?nosti"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11573,7 +10250,7 @@ msgstr[0] "pre %d sat"
 msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -11581,7 +10258,7 @@ msgstr[0] "%d sat u buduÄ?nosti"
 msgstr[1] "%d sata u buduÄ?nosti"
 msgstr[2] "%d sati u buduÄ?nosti"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11589,7 +10266,7 @@ msgstr[0] "pre %d dan"
 msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -11597,7 +10274,7 @@ msgstr[0] "%d dan u buduÄ?nosti"
 msgstr[1] "%d dana u buduÄ?nosti"
 msgstr[2] "%d dana u buduÄ?nosti"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11605,7 +10282,7 @@ msgstr[0] "pre %d nedelju"
 msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -11613,7 +10290,7 @@ msgstr[0] "%d nedelja u buduÄ?nosti"
 msgstr[1] "%d nedelje u buduÄ?nosti"
 msgstr[2] "%d nedelja u buduÄ?nosti"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11621,7 +10298,7 @@ msgstr[0] "pre %d mesec"
 msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -11629,7 +10306,7 @@ msgstr[0] "%d mesec u buduÄ?nosti"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11637,7 +10314,7 @@ msgstr[0] "pre %d godinu"
 msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -11645,83 +10322,86 @@ msgstr[0] "%d godina u buduÄ?nosti"
 msgstr[1] "%d godine u buduÄ?nosti"
 msgstr[2] "%d godina u buduÄ?nosti"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poreÄ?enje"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Izaberite datoteku"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "Ime p_ravila:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "PronaÄ?i stavke koje zadovoljavaju sledeÄ?e uslove"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "Ako su svi uslovi zadovoljeni"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "Ako je bilo koji uslov zadovoljen"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
-msgstr "_PronaÄ?i predmete:"
+msgstr "_PronaÄ?i stavke:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "Odgovori i nadreÄ?eno"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "U_kljuÄ?i niti"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038
+#: ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Odlazno"
 
@@ -11746,7 +10426,8 @@ msgid "Missing file name."
 msgstr "Nedostaje ime datoteke."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -11808,55 +10489,52 @@ msgstr ""
 "trenutnim vremenom kada se filtriranje desilo."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "vreme u odnosu na trenutno vreme"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "pre"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "u buduÄ?nosti"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "meseci"
-
-# bug: plural-forms
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "sekunde"
+#| msgid "in the future"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"pre\n"
+"u buduÄ?nosti"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "trenutno vreme"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"sekundi\n"
+"minuti\n"
+"sati\n"
+"dani\n"
+"nedelje\n"
+"meseci\n"
+"godine"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "vreme koje odredite"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "nedelje"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "godine"
+#| msgid "a time relative to the current time"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"trenutno vreme\n"
+"vreme koje odredite\n"
+"vreme u odnosu na trenutno vreme"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Ime pravila"
 
@@ -11865,8 +10543,7 @@ msgid "Composer Preferences"
 msgstr "Postavke sastavljaÄ?a"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "Podesite poÅ¡tu, ukljuÄ?ujuÄ?i sigurnost i prikaz poruke, ovde"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11910,21 +10587,24 @@ msgid "Evolution Network configuration control"
 msgstr "Kontrola mrežnih podešavanja Evolucije"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620
+#: ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
@@ -11933,16 +10613,128 @@ msgid "Network Preferences"
 msgstr "Postavke mreže"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133
+#: ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "Prosl_edi"
+
+#: ../mail/e-attachment-handler-mail.c:147
+#: ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "_Odgovori pošiljaocu"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "%d attached messages"
+msgstr "%d priloženih poruka"
+
+#: ../mail/e-mail-attachment-bar.c:122
+#: ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Prilog"
+msgstr[1] "Prilozi"
+msgstr[2] "Priloga"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+#| msgid "Month View"
+msgid "Icon View"
+msgstr "Pregled sa ikonama"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+#| msgid "_List View"
+msgid "List View"
+msgstr "Pregled sa spiskom"
+
+# bug: plural-forms if put as "%d matches"
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Poklapanja: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+#| msgid "Close this window"
+msgid "Close the find bar"
+msgstr "Zatvori traku pretrage"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "Pro_naÄ?i:"
+
+#: ../mail/e-mail-search-bar.c:540
+#| msgid "Always search"
+msgid "Clear the search"
+msgstr "OÄ?isti pretragu"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Prethodno"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "NaÄ?i prethodno pojavljivanje fraze"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_SledeÄ?e"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "NaÄ?i sledeÄ?e pojavljivanje fraze"
+
+#: ../mail/e-mail-search-bar.c:587
+#| msgid "M_atch case"
+msgid "Mat_ch case"
+msgstr "Pa_zi na veliÄ?inu slova"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "Stranica pregledana do dna, nastavljeno od vrha"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "Stranica pregledana do vrha, nastavljeno od dna"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Ne koristi se Å¡ifrovanje"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS Å¡ifrovanje"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL Å¡ifrovanje"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ugovor o licenci"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11955,110 +10747,126 @@ msgstr ""
 "za %s\n"
 "i oznaÄ?ite kuÄ?icu da bi ga prihvatili\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487
+#: ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Automatski sastavljeno"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Nikada"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Uvek"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877
+#: ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928
+#: ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poštu svakih"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "minu_ta"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420
+#: ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2479
+#: ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Podrazumevano"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2545
+#: ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Sigurnost"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2582
+#: ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583
+#: ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
-msgstr "Proveram za nove poruke"
+msgstr "Proveranje za nove poruke"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "UreÄ?ivaÄ? naloga"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3145
+#: ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
-msgstr "PomoÄ?nik Evolucija naloga"
+msgstr "PomoÄ?nik naloga Evolucije"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Podrazumevano]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Ime naloga"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1203 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318
+#: ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160
+#: ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132
+#: ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ProsleÄ?ena poruka --------"
 
-#: ../mail/em-composer-utils.c:1602
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
+#: ../mail/em-composer-utils.c:1585
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr "Nije dostavljena odrediÅ¡na adresa, prosleÄ?ivanje poruke je otkazano."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
+msgstr "Nije pronaÄ?en nalog za koriÅ¡Ä?enje, prosleÄ?ivanje poruke je otkazano."
 
 #: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
@@ -12070,18 +10878,14 @@ msgstr "nepoznati pošiljalac"
 #. * 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:2105
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} piše:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} ${TimeZone}, ${Sender} piše:"
 
 #: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "Pr_avila filtera"
 
@@ -12098,18 +10902,10 @@ msgstr "Dodeli boju"
 msgid "Assign Score"
 msgstr "Dodeli rezultat"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Zvono"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Završeno za"
@@ -12127,9 +10923,11 @@ msgid "Date sent"
 msgstr "Datum slanja"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../plugins/groupwise-features/share-folder.c:765
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
@@ -12160,7 +10958,7 @@ msgstr "ne poÄ?inje sa"
 
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
-msgstr "Priprema"
+msgstr "Nacrt"
 
 #: ../mail/em-filter-i18n.h:24
 msgid "ends with"
@@ -12178,228 +10976,246 @@ msgstr "Izraz"
 msgid "Follow Up"
 msgstr "Sledi"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#| msgid "Forward"
+msgid "Forward to"
+msgstr "Prosledi za"
+
+#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Važno"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "je posle"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "je pre"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "je oznaÄ?eno"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "nije oznaÄ?eno"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "nije podešeno"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "podešeno"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ä?ubre"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Provera Ä?ubreta"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Etiketa"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Dopisna lista"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Odgovara sve"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Telo poruke"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Zaglavlje poruke"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Poruka je Ä?ubre"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Poruka nije Ä?ubre"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+#| msgid "Message contains"
+msgid "Message Location"
+msgstr "Lokacija poruke"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Poveži na program"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Ä?itaj"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Primaoci"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex odgovara"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Odgovoreno"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "povratno"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "povratno veÄ?e od"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "povratno manje od"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Pokreni program"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Rezultat"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Pošiljalac"
 
 # bug(slobo): verovatno izveštaj o dostavi
-#: ../mail/em-filter-i18n.h:62
-#, fuzzy
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
-msgstr "Pošalji priznanicu"
+msgstr "Pošiljalac ili primaoci"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Postavi oznaku"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Postavi status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "VeliÄ?ina (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "zvuÄ?i kao"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Izvorni nalog"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "OdreÄ?eno zaglavlje"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "poÄ?inje sa"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928
+#: ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Naslov"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Nepostavljen status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "NeproÄ?itane poruke"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "ProÄ?itane poruke"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Skorašnje poruke"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Poruke nisu Ä?ubre"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
@@ -12435,11 +11251,13 @@ msgid "Quota usage"
 msgstr "IskoriÅ¡Ä?enost kvote"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2598 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359
+#: ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602
+#: ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "SanduÄ?e"
 
@@ -12452,236 +11270,261 @@ msgstr "Osobine fascikle"
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "Na_pravi"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "_Ime fascikle:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195
+#: ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960
+#: ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510
+#: ../mail/mail-component.c:169
 msgid "Drafts"
-msgstr "Priprema"
+msgstr "Nacrti"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513
+#: ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Å abloni"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520
+#: ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Za slanje"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522
+#: ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Poslato"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580
+#: ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "UÄ?itavanje..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:318
 #, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštanje fascikle %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavanje fascikle %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895
+#: ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštanje poruka u fasciklu %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897
+#: ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavanje poruka u fasciklu %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nije moguÄ?e ubaciti poruku(e) u ostavu na najviÅ¡em nivou"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Umnoži u fasciklu"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Premesti u fasciklu"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186
+#: ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "Pre_mesti"
+
+#: ../mail/em-folder-tree.c:994
+#: ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Otkaži _prevlaÄ?enje"
+
+#: ../mail/em-folder-tree.c:1702
+#: ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretraga fascikli u â??%sâ??"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Premesti..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni Za slanje"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129
+#: ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
-msgstr "Isprazni _smeÄ?e"
+msgstr "Isprazni _SmeÄ?e"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
-msgstr ""
+msgstr "_NeproÄ?itana Fascikla pretrage"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "Umnožavanje â??%sâ?? u â??%sâ??"
+msgstr "Umnožavanje â??%sâ?? u â??%sâ??"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Umnoži"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
-msgstr "Pravljenje fascikle â??%sâ??"
+msgstr "Pravljenje fascikle â??%sâ??"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090
+#: ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemate dovoljna ovlaÅ¡Ä?enja da obriÅ¡ete ovu poÅ¡tu."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "_Odgovori pošiljaocu"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "Prosl_edi"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "O_znaÄ?i kao proÄ?itano"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "OznaÄ?i kao _neproÄ?itano"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "OnaÄ?i kao _važno"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "_OznaÄ?i kao nevažno"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "OznaÄ?i kao _Ä?ubre"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "OznaÄ?i da _nije Ä?ubre"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praÄ?enje..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
-msgstr "Nat_pis"
+msgstr "_Oznaka"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -12690,705 +11533,645 @@ msgstr "Nat_pis"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355
+#: ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "Ništ_a"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "OznaÄ?_i kao zavrÅ¡eno"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
-msgstr "Fascikla pretrage na _temu"
+msgstr "Fascikla pretrage na _naslov"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Fascikla pretrage na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Fascikla pretrage na _primaoce"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Fascikla pretrage na dopisnu _listu"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
-msgstr "Filter na te_mu"
+msgstr "Filter na nas_lov"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filter na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filter na p_rimaoce"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filter na _dopisnu listu"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232
+#: ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "Nije moguÄ?e dobiti poruku"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "DovlaÄ?enje poruke..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "P_oziv za..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "Napravi Fasciklu _pretrage"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "_na ovu adresu"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
-msgstr "Pritisni da sakriješ/otkirješ adresu"
+msgstr "Pritisnite da sakrijete/otkrijete adrese"
 
-# bug: plural-forms if put as "%d matches"
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "Poklapanja: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "Pro_naÄ?i:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_Prethodno"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_SledeÄ?e"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "_Podudaraj veliko/malo slovo"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../mail/em-format-html-display.c:951
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:560
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka autentiÄ?na."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../mail/em-format-html-display.c:952
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Ova poruka je potpisana i ispravna Å¡to znaÄ?i da je poÅ¡iljalac poruke vrlo "
-"verovatno autentiÄ?an."
+#: ../mail/em-format-html-display.c:561
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "Ova poruka je potpisana i ispravna Å¡to znaÄ?i da je poÅ¡iljalac poruke vrlo verovatno autentiÄ?an."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../mail/em-format-html-display.c:953
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
+#: ../mail/em-format-html-display.c:562
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ispravan potpis, ali nije moguÄ?a provera poÅ¡iljaoca"
 
-#: ../mail/em-format-html-display.c:954
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
-"biti proveren."
+#: ../mail/em-format-html-display.c:563
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može biti proveren."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Potpis postoji, ali traži javni kljuÄ?"
 
-#: ../mail/em-format-html-display.c:955
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../mail/em-format-html-display.c:564
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "Ova poruka je potpisana, ali nema odgovarajuÄ?eg javnog kljuÄ?a."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../mail/em-format-html-display.c:962
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Ova poruka nije Å¡ifrovana.  Njen sadržaj je moguÄ?e videti u prenosu preko "
-"Interneta."
+#: ../mail/em-format-html-display.c:571
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+msgstr "Ova poruka nije Å¡ifrovana. Njen sadržaj je moguÄ?e videti u prenosu preko Interneta."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Å ifrovano, slabo"
 
-#: ../mail/em-format-html-display.c:963
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"Ova poruka je Å¡ifrovana, ali slabim algoritmom.  TeÅ¡ko je, ali ne i nemoguÄ?e "
-"da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
+#: ../mail/em-format-html-display.c:572
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "Ova poruka je Å¡ifrovana, ali slabim algoritmom.  TeÅ¡ko je, ali ne i nemoguÄ?e da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Å ifrovano"
 
-#: ../mail/em-format-html-display.c:964
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Ova poruka je Å¡ifrovana.  TeÅ¡ko Ä?e neko sa strane videti sadržaj ove poruke."
+#: ../mail/em-format-html-display.c:573
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "Ova poruka je Å¡ifrovana.  TeÅ¡ko Ä?e neko sa strane videti sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Å ifrovano, jako"
 
-#: ../mail/em-format-html-display.c:965
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"Ova poruka je Å¡ifrovana â?? i to jakim algoritmom.  Veoma je teÅ¡ko da neko sa "
-"strane u dogledno vreme vidi sadržaj ove poruke."
+#: ../mail/em-format-html-display.c:574
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "Ova poruka je šifrovana, jakim algoritmom. Veoma je teško da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Pre_gledaj sertifikat"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat nije Ä?itljiv"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Završeno u %B %d, %Y, %l:%M %p"
+#: ../mail/em-format-html-display.c:980
+#| msgid "Completed On"
+msgid "Completed on"
+msgstr "Završeno za"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "PrekoraÄ?eno:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "do %B %d, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "od"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "_Prilagodi na Å¡irinu"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "Prikaži _originalnu veliÄ?inu"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "SaÄ?uvaj prilog kao"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "Izaberite fasciklu za Ä?uvanje svih priloga"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "Izabrano Ä?uvanje..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d pri_log"
-msgstr[1] "%d pri_loga"
-msgstr[2] "%d pri_loga"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "_SaÄ?uvaj"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "SaÄ?_uvaj sve"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "Nema priloga"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575
+#: ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "O_tvori pomoÄ?u"
 
-#: ../mail/em-format-html-display.c:2668
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolucija ne može da iscrta ovo pismo pošto je preveliko. Možete ga "
-"pogledati neformatirano ili pomoÄ?u drugog ureÄ?ivaÄ?a teksta."
+#: ../mail/em-format-html-display.c:1711
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Evolucija ne može da iscrta ovo pismo poÅ¡to je preveliko. Možete ga pogledati neformatirano ili pomoÄ?u drugog ureÄ?ivaÄ?a teksta."
 
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. strana od %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505
+#: ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "DovlaÄ?enje â??%sâ??"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "Nepoznat spoljni deo poruke."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "Loše složen spoljni deo poruke."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "PokazivaÄ? na FTP stranicu (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "PokazivaÄ? na lokalnu datoteku (%s) koja odgovara stranici â??%sâ??"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "PokazivaÄ? na lokalnu datoteku (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "PokazivaÄ? na mrežni podatak (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "PokazivaÄ? na nepoznati spoljni podatak (tipa â??%sâ??)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Oblikovanje poruke"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Oblikovanje poruke..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926
+#: ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Kopija (Cc)"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568
+#: ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927
+#: ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Nevidljiva kopija (Bcc)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1459
+#: ../mail/em-format-html.c:1747
+#: ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Pošiljalac"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr "(%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr "(%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Poruku Å¡alje <b>%s</b> u ime <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "Å alje"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929
+#: ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930
+#: ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Grupe za vesti"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931
+#: ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Lice"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nije moguÄ?a obrada S/MIME poruke: nepoznata greÅ¡ka"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376
+#: ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nije moguÄ?a obrada MIME poruke. Prikazivanje izvora."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržani tip šifre za multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "Nije moguÄ?a obrada PGP/MIME poruke"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nije moguÄ?a obrada PGP/MIME poruke: nepoznata greÅ¡ka"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560
+#: ../mail/em-format.c:1689
+#: ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "Nije moguÄ?a obrada PGP poruke."
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nije moguÄ?a obrada PGP/MIME poruke: nepoznata greÅ¡ka"
 
 # bug: requires a comment on usage
 # sliÄ?no kao za mesece i nedelje
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "svaki put"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "jednom nedeljno"
 
 # bug: requires a comment on usage
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "jednom meseÄ?no"
 
-#: ../mail/em-mailer-prefs.c:333
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "Dodaje prilagoÄ?eno zaglavlje za neželjenu poÅ¡tu"
 
-#: ../mail/em-mailer-prefs.c:337
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "Naziv fascikle:"
 
-#: ../mail/em-mailer-prefs.c:338
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "Vrednost zaglavlja sadrži:"
 
-#: ../mail/em-mailer-prefs.c:444
+#: ../mail/em-mailer-prefs.c:438
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Zaglavlje"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "Sadrži vrednost"
 
-#: ../mail/em-mailer-prefs.c:467
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/em-mailer-prefs.c:470
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "Etiketa"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1063
+#: ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1095 ../mail/em-mailer-prefs.c:1150
+#: ../mail/em-mailer-prefs.c:1071
+#: ../mail/em-mailer-prefs.c:1126
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Dodatak %s nije dostupan. Proverite da li je paket instaliran."
 
-#: ../mail/em-mailer-prefs.c:1116
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "Nema dostupnog dodatka za Ä?ubre"
 
+#: ../mail/em-mailer-prefs.c:1455
+#| msgid "Table header"
+msgid "Date header:"
+msgstr "Zaglavlje datuma:"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "Kasnije"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
-msgstr ""
+msgstr "Prelazak"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Nije moguÄ?e pravljenje nove fascikle â??%sâ??: %s"
+msgstr "Nije moguÄ?e pravljenje nove fascikle â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Nije moguÄ?e umnožiti fasciklu â??%sâ?? u â??%sâ??: %s"
+msgstr "Nije moguÄ?e umnožiti fasciklu â??%sâ?? u â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Nije moguÄ?a pretraga za postojeÄ?im poÅ¡tanskim sanduÄ?iÄ?ima u â??%sâ??: %s"
+msgstr "Nije moguÄ?a pretraga za postojeÄ?im poÅ¡tanskim sanduÄ?iÄ?ima u â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mesto i hijerarhija fascikli pošte u Evoluciji je izmenjena od Evolucije 1."
-"h.\n"
+"Mesto i hijerarhija fascikli pošte u Evoluciji je izmenjena od Evolucije 1.h.\n"
 "\n"
 "Molim budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Nije moguÄ?e otvaranje starog POP Ä?uvaj-na-serveru podatka â??%sâ??: %s"
+msgstr "Nije moguÄ?e otvaranje starog POP Ä?uvaj-na-serveru podatka â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Nije moguÄ?e pravljenje POP3 Ä?uvaj-na-serveru direktorijuma podataka â??%sâ??: %s"
+msgstr "Nije moguÄ?e pravljenje POP3 Ä?uvaj-na-serveru direktorijuma podataka â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Nije moguÄ?e umnožavanje POP3 Ä?uvaj-na-serveru podatka â??%sâ??: %s"
+msgstr "Nije moguÄ?e umnožavanje POP3 Ä?uvaj-na-serveru podatka â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504
+#: ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Nije uspelo pravljenje lokalne ostave poÅ¡te â??%sâ??: %s"
+msgstr "Nije uspelo pravljenje lokalne ostave poÅ¡te â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
-msgstr ""
+msgstr "Prenošenje fascikli"
 
-#: ../mail/em-migrate.c:2974
-#, fuzzy
+#: ../mail/em-migrate.c:2874
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Format pregleda fascikli poÅ¡te prebaÄ?en je na sqlite poÄ?ev od Evolucije "
-"2.24.\n"
+"Format sažetka fascikli poÅ¡te prebaÄ?en je na SQLite joÅ¡ od Evolucije 2.24.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Nije moguÄ?e pravljenje lokalnih fascikli poÅ¡te u â??%sâ??: %s"
+msgstr "Nije moguÄ?e pravljenje lokalnih fascikli poÅ¡te u â??%sâ??: %s"
 
-#: ../mail/em-migrate.c:3075
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Nije moguÄ?e Ä?itanje podeÅ¡avanja prethodne instalacije Evolucije, â??evolution/"
-"config.xmldbâ?? ne postoji ili je oÅ¡teÄ?en."
+#: ../mail/em-migrate.c:2974
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Nije moguÄ?e Ä?itanje postavke prethodne instalacije Evolucije, â??evolution/config.xmldbâ?? ne postoji ili je oÅ¡teÄ?en."
+
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "SaÄ?uvaj kao..."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "neimenovana_slika.%s"
+
+#: ../mail/em-popup.c:495
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Postavi kao _pozadinu"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
 #. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
+#: ../mail/em-popup.c:547
+#: ../mail/em-popup.c:746
 msgid "_Add to Address Book"
-msgstr "Dodaj u _imenik"
+msgstr "Dodaj u _adresar"
+
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Otvori u %s..."
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ova ostava ne podržava prijave, ili nisu omoguÄ?ene."
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Prijavljeno"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Fascikla"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Izaberite server."
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
-msgstr "Propusni_ci poruka"
+msgstr "Filteri poruka"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "poruka"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "SaÄ?uvaj poruku..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Izvor fas_cikle pretrage"
 
@@ -13406,11 +12189,11 @@ msgstr "Å irina prozora â??Slanje i primanje poÅ¡teâ??"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows Evolution to display text part of limited size"
-msgstr "Dozvoli evoluciji da prikaže tekstualni deo ograniÄ?ene veliÄ?ine"
+msgstr "Dozvoli Evoluciji da prikaže tekstualni deo ograniÄ?ene veliÄ?ine"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
-msgstr "Uvek traži priznanicu"
+msgstr "Uvek traži povratnicu"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
@@ -13446,35 +12229,23 @@ msgstr "Direktorijum sastavljaÄ?a za uÄ?itavanje/prilaganje"
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA"
+msgstr "Sažmi prikaz adresa u TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-"Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA na broj naznaÄ?en u "
-"address_count-u."
+msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgstr "Sažmi prikaz adresa u TO/CC/BCC na broj odreÄ?en u address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"KontroliÅ¡e uÄ?estalost usklaÄ?ivanja lokalnih izmena sa mrežnim serverom poÅ¡te. "
-"Interval mora biti najmanje 30 sekundi."
+msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgstr "KontroliÅ¡e uÄ?estalost usklaÄ?ivanja lokalnih izmena sa mrežnim serverom poÅ¡te. Interval mora biti najmanje 30 sekundi."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "PrilagoÄ?ena zaglavlja za upotrebu prilikom provere neželjene poÅ¡te."
 
 #: ../mail/evolution-mail.schemas.in.h:19
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"PrilagoÄ?ena zaglavlja za upotrebu prilikom provere neželjene poÅ¡te. Elementi "
-"spiska su niz formata â??naziv_zaglavlja=vrednostâ??."
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "PrilagoÄ?ena zaglavlja za upotrebu prilikom provere neželjene poÅ¡te. Elementi spiska su niz formata â??headername=valueâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13514,7 +12285,7 @@ msgstr "Podrazumevani stil odgovora"
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
-msgstr "Podrazumevana vrednost za rašireni niz"
+msgstr "Podrazumevana vrednost za raširenu raspravu"
 
 #: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
@@ -13529,51 +12300,28 @@ msgid "Default width of the subscribe dialog."
 msgstr "Podrazumevana Å¡irina prozorÄ?eta za prijavu."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"UtvrÄ?uje da li da samo u adresaru pregleda adrese u potrazi za neželjenom "
-"poštom"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
+msgstr "UtvrÄ?uje da li da samo u adresaru pregleda adrese u potrazi za neželjenom poÅ¡tom"
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "UtvrÄ?uje da li da pregleda u adresaru adrese poÅ¡iljaoca"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"tvrÄ?uje da li da pregleda u adresaru adrese poÅ¡iljaoca. Ukoliko je pronaÄ?e, "
-"ne svrstava je u neželjenu poÅ¡tu. Traži je u adresarima oznaÄ?enim za "
-"samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) oznaÄ?eni za "
-"samodopunjavanje."
+msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgstr "UtvrÄ?uje da li da pretraži u adresaru adrese poÅ¡iljaoca. Ukoliko je pronaÄ?e, ne svrstava je u neželjenu poÅ¡tu. Traži je u adresarima oznaÄ?enim za samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) oznaÄ?eni za samodopunjavanje."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-"UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neželjene "
-"pošte"
+msgstr "UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neželjene poÅ¡te"
 
 #: ../mail/evolution-mail.schemas.in.h:37
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neželjene "
-"poÅ¡te. Ukoliko je opcija ukljuÄ?ena a zaglavlja navedena, provera Ä?e biti brža."
+msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+msgstr "UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neželjene poÅ¡te. Ukoliko je opcija ukljuÄ?ena a zaglavlja navedena, provera Ä?e biti brža."
 
 #: ../mail/evolution-mail.schemas.in.h:38
-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 â??Temaâ?? u uspravnom "
-"pogledu kolone â??Porukeâ??."
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+msgstr "UtvrÄ?uje da li da koristi isti font u poljima â??Å aljeâ?? and â??Naslovâ?? u uspravnom pregledu kolone â??Porukeâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -13608,670 +12356,575 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smeÄ?em pri zatvaranju Evolucije."
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgstr "OmoguÄ?ava animirane slike u HTML poÅ¡ti. Mnogim korisnicima smetaju animirane i umesto njih žele nepokretne slike."
+
+#: ../mail/evolution-mail.schemas.in.h:48
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "UkljuÄ?uje ili iskljuÄ?uje magiÄ?nu razmaknicu"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+#| msgid "It disables/enables the prompt while marking multiple messages."
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "UkljuÄ?uje ili iskljuÄ?uje upozorenje pri oznaÄ?avanju viÅ¡e poruka."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "UkljuÄ?i ili iskljuÄ?i moguÄ?nost traženja kucanja u napred"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "UkljuÄ?uje fascikle pretrage"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "OmoguÄ?ava fascikle pretrage pri pokretanju."
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"UkljuÄ?i moguÄ?nost pretrage u boÄ?noj oblasti tako da možete pokrenuti "
-"interaktivnu pretragu kucajuÄ?i u polje za tekst. Korist je da možete lako "
-"naÄ?i fasciklu u toj boÄ?noj oblasti samo kucajuÄ?i ime fascikle i izbor skaÄ?e "
-"automatski na tu fasciklu."
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
+msgstr "OmoguÄ?ava pretraživanje iz boÄ?ne trake, Å¡to donosi interaktivnost u pretrazi naziva fascikli."
 
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"UkljuÄ?ite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
-"spisak poruka i fascikli."
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "UkljuÄ?ite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i spisak poruka i fascikli."
 
 # bug: unclear
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "UkljuÄ?ite da iscrtavate tekstualni deo poruke ograniÄ?ene veliÄ?ine."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
-msgstr "UkljuÄ?uje/iskljuÄ?uje prikaz kurzora"
+msgstr "UkljuÄ?uje/iskljuÄ?uje prikaz kursora"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
+msgstr "Kodiraj nazive datoteka na Outlook/GMail naÄ?in"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+msgstr "Kodira nazive datoteka u zaglavljima pošte kao što to rade Outlook ili GMail, kako bi ispravno prikazali nazive sa UTF-8 slovima koje šalje Evolucija, pošto se ne pridržavaju RFC 2231, nego koriste neispravan standard RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Visina površi liste poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pita ga da li "
-"zaista želi to da uradi."
-
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Ako je â??Pregled porukeâ?? povrÅ¡ ukljuÄ?ena, onda pokažite je jednu do druge "
-"radije nego uspravno."
-
 #: ../mail/evolution-mail.schemas.in.h:63
-#, fuzzy
-msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"Ukoliko nema ugraÄ?enog pregledaÄ?a za ovaj mime tip u okviru Evolucije, svi "
-"mime tipovi sa ove liste koji su vezani bonobo pregledaÄ?em delova u Gnomovoj "
-"bazi mime tipova mogu biti koriÅ¡Ä?eni za prikaz sadržaja."
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pita ga da li zaista želi to da uradi."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"PoÄ?etna visina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se ažurira ukoliko "
-"korisnik produži prozor."
+msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
+msgstr "Ako je povrÅ¡ â??Pregledâ?? ukljuÄ?ena, onda je prikazuje jednu do druge radije nego uspravno."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"PoÄ?etna veliÄ?ina uveÄ?anog prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se "
-"ažurira ukoliko korisnik uveÄ?a ili umanji prozor. Napominjemo da Evolucija ne "
-"koristi ovu vrednost poÅ¡to ovaj prozor ne može biti uveÄ?an. Ova je vrednost "
-"samo upotpunjuje postavke."
+msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
+msgstr "Ukoliko u okviru Evolucije nema ugraÄ?enog pregledaÄ?a za ovaj MIME tip, svi MIME tipovi sa ovog spiska koji su vezani za pregledaÄ? Bonobo delova u Gnomovoj bazi MIME tipova mogu biti koriÅ¡Ä?eni za prikaz sadržaja."
 
 #: ../mail/evolution-mail.schemas.in.h:66
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"PoÄ?etna Å¡irina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se ažurira ukoliko "
-"korisnik proširi prozor."
+msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+msgstr "PoÄ?etna visina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se ažurira ukoliko korisnik produži prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "To ukljuÄ?uje/iskljuÄ?uje upozorenje kada oznaÄ?avate viÅ¡e poruka."
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr "PoÄ?etna veliÄ?ina uveÄ?anog prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se ažurira ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne koristi ovu vrednost poÅ¡to ovaj prozor ne može biti uveÄ?an. Ova vrednost samo upotpunjuje postavke."
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr ""
-"UknjuÄ?uje/onemoguÄ?uje svojstvo gde su potrebni viÅ¡estruki upiti za "
-"neophodnost sinhronizacije van mreže."
+msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
+msgstr "PoÄ?etna Å¡irina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se ažurira ukoliko korisnik proÅ¡iri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"UkljuÄ?uje/iskljuÄ?uje ponavljanje upozorenja da je brisanje poruke iz fascikle "
-"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
+msgstr "OmoguÄ?ava/onemoguÄ?ava svojstvo gde su potrebni viÅ¡estruki upiti za neophodnost sinhronizacije van mreže."
 
 #: ../mail/evolution-mail.schemas.in.h:70
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr "OmoguÄ?ava/onemoguÄ?ava ponavljanje upozorenja da je brisanje poruke iz fascikle pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Poslednje vreme pražnjenja Ä?ubreta"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Poslednje vreme pražnjenja smeÄ?a"
 
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "List of Labels and their associated colors"
-msgstr "Lista oznaka i njima dodeljenih boja"
-
 #: ../mail/evolution-mail.schemas.in.h:74
-#, fuzzy
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Lista mime tipova radi provere za bonobo pregledaÄ?ima"
+msgid "List of Labels and their associated colors"
+msgstr "Spisak oznaka i njima dodeljenih boja"
 
 #: ../mail/evolution-mail.schemas.in.h:75
-msgid "List of accepted licenses"
-msgstr "Lista prihvaÄ?enih licenci"
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Lista MIME tipova radi provere za Bonobo pregledaÄ?ima delova"
 
 #: ../mail/evolution-mail.schemas.in.h:76
-msgid "List of accounts"
-msgstr "Lista naloga"
+msgid "List of accepted licenses"
+msgstr "Spisak prihvaÄ?enih licenci"
 
 #: ../mail/evolution-mail.schemas.in.h:77
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Lista naloga koje poznaje poštanski deo Evolucije. Lista sadrži nizove koje "
-"imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
+msgid "List of accounts"
+msgstr "Spisak naloga"
 
 #: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of custom headers and whether they are enabled."
-msgstr "Lista prilagoÄ?enih zaglavlja i da li su ukljuÄ?ena."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "Spisak naloga koje poznaje poštanski deo Evolucije. Spisak sadrži nizove koje imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
 
 #: ../mail/evolution-mail.schemas.in.h:79
-msgid "List of dictionary language codes used for spell checking."
-msgstr "Spisak oznaka jezika reÄ?nika koji se koriste za proveru pravopisa."
+msgid "List of custom headers and whether they are enabled."
+msgstr "Spisak prilagoÄ?enih zaglavlja i da li su ukljuÄ?ena."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"Lista oznaka koje poznaje poštanski deo Evolucije. Lista sadrži nizove "
-"oblika ime:boja gde boja koristi HTML hex kodiranje."
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Spisak oznaka jezika reÄ?nika koji se koriste za proveru pravopisa."
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid "List of protocol names whose license has been accepted."
-msgstr "Lista imena protokola Ä?ija je licenca prihvaÄ?ena."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži nizove oblika ime:boja gde boja koristi HTML hex kodiranje."
 
 #: ../mail/evolution-mail.schemas.in.h:82
-#, fuzzy
-msgid "Load images for HTML messages over HTTP"
-msgstr "UÄ?itava slike za HTML poruke preko http-a"
+msgid "List of protocol names whose license has been accepted."
+msgstr "Spisak imena protokola Ä?ija je licenca prihvaÄ?ena."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-#, fuzzy
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"UÄ?itava slike za HTML poruke preko http(s)-a. MoguÄ?e su vrednosti: â??0â?? - "
-"nikada ne uÄ?itavaj slike sa mreže. â??1â?? - uÄ?itavaj slike ukoliko je poÅ¡iljalac "
-"u imeniku. â??2â?? - uvek uÄ?itavaj slike sa mreže."
+msgid "Load images for HTML messages over HTTP"
+msgstr "UÄ?itava slike za HTML poruke preko HTTP-a"
 
 #: ../mail/evolution-mail.schemas.in.h:84
+msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+msgstr "UÄ?itava slike za HTML poruke preko HTTP(S)-a. MoguÄ?e su vrednosti: â??0â?? - Nikada ne uÄ?itava slike sa mreže. â??1â?? - UÄ?itava slike iz poruka ukoliko je poÅ¡iljalac u kontaktima. â??2â?? - Uvek uÄ?itava slike sa mreže."
+
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Beleži radnje filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "OznaÄ?ava kao viÄ?enu posle navedenog roka"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "OznaÄ?ava kao viÄ?enu posle navedenog roka."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "OznaÄ?ava citate u pregledu poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "OznaÄ?ava citate u pregledu poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "Podrazumevana Å¡irina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Stil prikaza poruke ( â??normalâ?? za normalan prikaz; â??full headersâ?? za prikaz "
-"svih zaglavlja; â??sourceâ?? za izvorni prikaz)"
+msgstr "Stil prikaza poruke (â??normalâ?? za normalan prikaz; â??full headersâ?? za prikaz svih zaglavlja; â??sourceâ?? za izvorni prikaz)"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana izmeÄ?u pražnjenja Ä?ubreta na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana izmeÄ?u pražnjenja smeÄ?a na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanje vreme izmeÄ?u pražnjenja Ä?ubreta na izlazu, u danima."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme izmeÄ?u pražnjenja smeÄ?a na izlazu, u danima."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Broj adresa za prikaz u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA"
+msgstr "Broj adresa za prikaz u TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Pita kada je naslov prazan"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pita korisnika kada pokuša da isprazni fasciklu."
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pita korisnika kada pokuša da pošalje poruku bez naslova."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "Traži proveru da li korisnik želi odmah da se iskljuÄ?i sa mreže"
+msgstr "Traži proveru da li korisnik želi odmah da se iskljuÄ?i sa mreže"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "Upozori kod brisanja poruka iz fascikle pretrage"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Pita pri pražnjenju"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Pita kada korisnik unese samo nevidljivu kopiju (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pita korisnika kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Pita kada korisnik pokuša da pošalje HTML poruku primaocima koji možda ne "
-"žele da primaju HTML poštu."
-
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Pita kada korisnik pokuša da pošalje HTML poruku primaocima koji možda ne žele da primaju HTML poštu."
+
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pita korisnika kada pokuša da pošalje poruku bez primalaca."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pita kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Pita pri oznaÄ?avanju viÅ¡e poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr "Postavi personalizovane potpise povrh odgovora"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+#| msgid "Start _typing at the bottom on replying"
+msgid "Put the cursor at the bottom of replies"
+msgstr "Postavlja kursor na dno odgovora"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Prepoznaje emotikone u tekstu i zamenjuje ih slikama."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima Ä?ubreta u dolaznoj poÅ¡ti."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "SaÄ?uvaj direktorijum"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "Traži sliku pošiljaoca u lokalnim adresarima"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji poštu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano šalje poštu kao HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "Prikazuje kolonu sa e-adresama  u spisku poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "Interval sinhronizacije sa serverom"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Prikaži polje â??Bccâ?? pri slanju poruke"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Prikaži polje â??Ccâ?? pri slanju poruke"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Prikaži polje â??Å aljeâ?? pri slanju na dopisnu listu"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "Prikaži polje â??Å aljeâ?? pri slanju poruke"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Prikaži polje â??Odgovor zaâ?? pri slanju na dopisnu listu"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+#| msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Prikazuje polje â??Odgovor zaâ?? kada Å¡alje poruku"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+#| msgid "_Show image animations"
+msgid "Show image animations"
+msgstr "Prikazuje animirane slike"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "Prikatuje sliku pošiljaoca"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Prikazuje polje â??Bccâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga poÅ¡te."
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Prikazuje polje â??Bccâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga poÅ¡te."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "Prikazuje polje â??Å aljeâ?? pri slanju na dopisnu listu. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga dopisne liste."
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Prikazuje polje â??Å aljeâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga poÅ¡te."
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "Prikazuje polje â??Odgovor zaâ?? pri slanju na dopisnu listu. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga dopisne liste."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "Prikazuje polje â??Odgovor zaâ?? pri slanju na poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga naloga poÅ¡te."
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Prikazuje e-adresu pošiljaoca u posebnoj koloni u spisku poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikazuje sliku poÅ¡iljaoca u oknu za Ä?itanje poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Provera pravopisa unutar"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "Boja za proveru pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Podrazumevana Å¡irina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
-msgstr "Slovni lik terminala"
+msgstr "Font terminala"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "OgraniÄ?enje tekstualnog dela poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za Ä?ubre"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Poslednje vreme pražnjenja Ä?ubreta, u danima od poÄ?etka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Vreme pražnjenja smeÄ?a, u danima od poÄ?etka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veliÄ?ine za prikaz poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-"Može imati tri moguÄ?e vrednosti. â??0â?? za greÅ¡ke. â??1â?? za upozorenja. â??2â?? za "
-"poruke o dijagnozi kvara."
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+msgstr "Može imati tri moguÄ?e vrednosti. â??0â?? za greÅ¡ke. â??1â?? za upozorenja. â??2â?? za poruke o dijagnozi kvara."
 
 # bug: s/interms/in terms/ (space)
-#: ../mail/evolution-mail.schemas.in.h:143
-#, 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."
-msgstr ""
-"Ovo odreÄ?uje najveÄ?u veliÄ?inu tekstualnog dela koji se može iscrtati u "
-"Evoluciji. Podrazumeva se 4MB/4096 KB i navedeno je kao broj KB."
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr "Ovo odreÄ?uje najveÄ?u veliÄ?inu tekstualnog dela koji može biti formatiran u Evoluciji. Podrazumevano je 4MB / 4096 KB i navedeno je kao broj KB."
 
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"Ovo je podrazumevani dodatak kuke za Ä?ubre, Ä?ak i ako su ukljuÄ?eni viÅ¡estruki "
-"dodaci. Ukoliko je pomenuti podrazumevani dodatak iskljuÄ?en, preostali "
-"dostupni dodaci neÄ?e biti aktivirani."
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+msgstr "Ovo je podrazumevani dodatak kuke za Ä?ubre, Ä?ak i ako su ukljuÄ?eni viÅ¡estruki prikljuÄ?ci. Ukoliko je pomenuti podrazumevani prikljuÄ?ak iskljuÄ?en, preostali dostupni prikljuÄ?ci neÄ?e biti aktivirani."
 
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-msgstr ""
-"Ovak kljuÄ? je proÄ?itan jednom i potom vraÄ?en na â??falseâ?? (netaÄ?no). Ovo uklanja "
-"poštu sa spiska i pregled za tu fasciklu."
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+msgstr "Ovak kljuÄ? je proÄ?itan jednom i potom vraÄ?en na â??falseâ?? (netaÄ?no). Ovo uklanja poÅ¡tu sa spiska i pregled za tu fasciklu."
 
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"Ovaj kljuÄ? treba da sadrži listu XML struktura za navoÄ?enje prilagoÄ?enih "
-"zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header "
-"enabled&gt; - omoguÄ?eno za prikazivanje zaglavlja u pregledu poÅ¡te."
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "Ovaj kljuÄ? treba da sadrži listu XML struktura za navoÄ?enje prilagoÄ?enih zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header enabled&gt; - omoguÄ?eno za prikazivanje zaglavlja u pregledu poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"Ova opcija se odnosi na kljuÄ? lookup_addressbook i koristi se za odreÄ?ivanje "
-"da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta "
-"primljena od poznatih pošiljalaca od one neželjene."
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
+msgstr "Ova opcija se odnosi na kljuÄ? lookup_addressbook i koristi se za odreÄ?ivanje da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila poÅ¡ta primljena od poznatih poÅ¡iljalaca od one neželjene."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ova Ä?e opcija pripomoÄ?i brzini pribavljanja poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
-"posle Ä?ega je â??...â?? prikazano."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+msgstr "Ovo podeÅ¡ava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, posle Ä?ega je â??...â?? prikazano."
 
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi podrazumevano biti raÅ¡ireni ili "
-"skupljeni. Evolucija zahteva ponovno pokretanje."
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+msgstr "Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi podrazumevano biti raÅ¡ireni ili skupljeni. Evolucija zahteva ponovno pokretanje."
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi biti razvrstani po poslednjoj poruci "
-"jednog niza, umesto po datumu. Evolucija zahteva ponovno pokretanje."
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+msgstr "Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi biti razvrstani po poslednjoj poruci jednog niza, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "Razvrstava spisak poruka po raspravama."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "Razvrstaj poruke po raspravama"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži poruke prema naslovu rasprave"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Vreme za oznaÄ?avanje poruke kao viÄ?ene"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Vreme za oznaÄ?avanje poruke kao viÄ?ene."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Boja za podvlaÄ?enje pravopisnih greÅ¡ki prilikom provere pravopisa."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
-msgstr "Koristi sopstveni slovni lik"
+msgstr "Koristi sopstvene fontove"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
-msgstr "Koristi prilagoÄ?eni font za prikaz poÅ¡te."
+msgstr "Koristi prilagoÄ?ene fontove za prikaz poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "Koristite jedan do drugog ili Å¡iroki raspored"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "Slovni lik promenljive veliÄ?ine"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Opcija Pregled/kopija (Cc) je izabrana"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "Opcija Pregled/kopija (Cc) je izabrana."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "Opcija Pregled/Å¡alje je izabrana"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "Opcija Pregled/Å¡alje je izabrana."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "Opcija Pregled/prima je izabrana"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "Opcija Pregled/pošalji je izabrana."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgstr "Korisnicima se miÅ¡ljenje razlikuje gde bi trebalo kursor da bude kada se odgovara na poruku. Ovo utvrÄ?uje da li Ä?e biti postavljen na vrh ili na dno poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Opcija Pregled/odgovor je izabrana"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+msgstr "Korisnicima se miÅ¡ljenje razlikuje gde bi trebalo potpis da bude kada se odgovara na poruku. Ovo utvrÄ?uje da li Ä?e biti postavljen na vrh ili na dno poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "Opcija Pregled/odgovor je izabrana."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "Font promenljive veliÄ?ine"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Da li se povratnica podrazumevano dodaje svakoj poruci."
 
-#: ../mail/evolution-mail.schemas.in.h:178
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "Da li se iskljuÄ?uje skraÄ?ivanje naziva fascikli u stablu."
+msgstr "Da li da onemoguÄ?i opciju skraÄ?ivanja naziva fascikli u boÄ?noj traci."
 
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Da li pokušati prikaz niza rasprave po naslovu kada poruke ne sadrže "
-"zaglavlja â??In-Reply-Toâ?? ili â??Referencesâ??."
+#: ../mail/evolution-mail.schemas.in.h:187
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja In-Reply-To ili References."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
-msgstr "Da li se poruke nižu na osnovu poslednje poruke u nizu"
+msgstr "Da li se poruke nižu na osnovu poslednje poruke u raspravi"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
-msgstr "Širina površi liste poruka"
+msgstr "Širina površi spiska poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
-msgstr "Širina površi liste poruka."
+msgstr "Širina površi spiska poruka."
 
 #: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
@@ -14286,12 +12939,12 @@ msgid "Import mail from Elm."
 msgstr "Važna pošta iz programa Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
@@ -14309,11 +12962,12 @@ msgstr "Uvoženje poÅ¡tanskog sanduÄ?eta"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560
+#: ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
-msgstr "Uvoženje â??%sâ??"
+msgstr "Uvoženje â??%sâ??"
 
 #: ../mail/importers/mail-importer.c:371
 #, c-format
@@ -14337,26 +12991,27 @@ msgstr "Uvozi poštu iz programa Pine."
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235
+#: ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -14364,7 +13019,7 @@ msgstr[0] "%d izabrana,"
 msgstr[1] "%d izabrane,"
 msgstr[2] "%d izabranih,"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -14372,7 +13027,7 @@ msgstr[0] "%d obrisano"
 msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -14380,15 +13035,15 @@ msgstr[0] "%d Ä?ubre"
 msgstr[1] "%d Ä?ubreta"
 msgstr[2] "%d Ä?ubreta"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "%d u pripremi"
-msgstr[1] "%d u pripremi"
-msgstr[2] "%d u pripremi"
+msgstr[0] "%d nacrt"
+msgstr[1] "%d nacrta"
+msgstr[2] "%d nacrta"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14396,7 +13051,7 @@ msgstr[0] "%d poslato"
 msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -14404,7 +13059,7 @@ msgstr[0] "%d neposlato"
 msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -14412,7 +13067,7 @@ msgstr[0] "%d neproÄ?itana,"
 msgstr[1] "%d neproÄ?itane,"
 msgstr[2] "%d neproÄ?itanih,"
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14420,77 +13075,73 @@ msgstr[0] "%d ukupno"
 msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Nova fascikla za poštu"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Napravi novu fasciklu za poštu"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Neuspela nadogradnja podešavanja pošte ili fascikli."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " _Proveri podržane tipove "
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Napomena: zahteva ponovno pokretanje programa)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL nije podržan u ovoj verziji Evolucije</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Fotografija pošiljaoca</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Po_tpisi</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Opcija za prikaz prve poruke</b> (ne preporuÄ?uje se)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Jezici</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Podaci o nalogu</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentifikacija</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sastavljanje poruka</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Podešavanje</span>"
 
@@ -14524,7 +13175,7 @@ msgstr "<span weight=\"bold\">Slovni lik za poruke</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Priznanice</span>"
+msgstr "<span weight=\"bold\">Povratnice</span>"
 
 #: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
@@ -14541,11 +13192,11 @@ msgstr "<span weight=\"bold\">PriliÄ?no dobra privatnost (PGP/GPG)</span>"
 
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Slovni lik za Å¡tampu</span>"
+msgstr "<span weight=\"bold\">Fontovi za Å¡tampu</span>"
 
 #: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">Podešavanja posrednika</span>"
+msgstr "<span weight=\"bold\">Postavke posrednika</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -14561,7 +13212,7 @@ msgstr "<span weight=\"bold\">Sigurnost</span>"
 
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Poslate i poruke u pripremi</span>"
+msgstr "<span weight=\"bold\">Poslate poruke i nacrti</span>"
 
 #: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
@@ -14609,61 +13260,85 @@ msgstr "Uv_ek šifruj i meni pri slanju šifrovane pošte"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
-msgstr "Uvek traži priznanicu"
+msgstr "Uvek traži povratnicu"
+
+#: ../mail/mail-config.glade.h:45
+#| msgid "Attachment Reminder"
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Prilog\n"
+"Ugnježdeno\n"
+"Citirano"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"Prilog\n"
+"Ugnježden (Outlook stil)\n"
+"Citiran\n"
+"Bez citata"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "Uvek umetni slike _emotikona"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "BaltiÄ?ki (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "BaltiÄ?ki (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "K_odna strana:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "_Proveri podržane tipove "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr "_Proveri podržane tipove"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
-msgstr "Proveri ima li neželjene poÅ¡te u _prilagoÄ?enim zaglavljima"
+msgstr "Proveri ima li Ä?ubreta u _prilagoÄ?enim zaglavljima"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
-msgstr "Proveri ima li neželjenog u _pristigloj pošti"
+msgstr "Proveri ima li Ä?ubreta u _pristigloj poÅ¡ti"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Proveri da pristigle poruke nisu Ä?ubre"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "OÄ?i_sti"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "OÄ?is_ti"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogreÅ¡no napisane reÄ?i:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14677,337 +13352,300 @@ msgstr ""
 "Sada ste spremni da šaljete i primate poštu \n"
 "koriÅ¡Ä?enjem Evolucije. \n"
 "\n"
-"Kliknite â??Primeniâ?? da saÄ?uvate podeÅ¡avanja."
+"Kliknite â??Primeniâ?? da saÄ?uvate postavke."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
-msgstr "Obriši neželjenu poštu pri i_zlazu"
+msgstr "ObriÅ¡i Ä?ubre pri i_zlazu"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitalno potpiši od_lazne poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ne formatiraj poruke kada veliÄ?i_na preÄ?e"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "Ne oznaÄ?ava_j poruke kao neželjene ako je poÅ¡iljalac u mom adresaru"
-
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "Ne citiraj"
+msgstr "Ne oznaÄ?ava_j poruke kao Ä?ubre ako je poÅ¡iljalac u mom adresaru"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
-msgstr "_Fascikla Priprema:"
+msgstr "_Fascikla Nacrti:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "Nalozi e-pošte"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "Elektronska _adresa:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni fascikle sa _smeÄ?em na izlazu"
 
-#: ../mail/mail-config.glade.h:79
-#, fuzzy
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
-msgstr "UkljuÄ?i MagiÄ?nu razmak_nicu"
+msgstr "OmoguÄ?ava MagiÄ?nu razmak_nicu"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "UkljuÄ?i fascikle pret_rage"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za Å¡i_frovanje:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Å ifruj odlazeÄ?e poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
-msgstr "UtvrÄ?ene-pirine:"
+msgstr "UtvrÄ?ene-Å¡irine:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "Font nep_romenjive Å¡irine:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
-msgstr "Osobine slovnog lika"
+msgstr "Osobine fonta"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Oblikuj poruke u H_TML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "Ime i prezime:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP posrednik:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "Unutar"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "Unutar (Outlook stil)"
+#: ../mail/mail-config.glade.h:101
+msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
+msgstr "Ukoliko server koristi nestandardan port onda se njegova adresa navodi kao â??server-name:port-numberâ??"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
-msgstr "Mesto poÅ¡tanskog sanduÄ?eta"
+msgstr "Lokacija poÅ¡tanskog sanduÄ?eta"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "SastavljaÄ? poruke"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Bez _posrednika za:"
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "Napomena: PodvuÄ?en znak u nazivu koristi se kao skraÄ?enica u meniju."
+#: ../mail/mail-config.glade.h:112
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "Napomena: podvuÄ?en znak u oznaci koristi se kao skraÄ?enica u meniju."
 
-#: ../mail/mail-config.glade.h:109
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: ../mail/mail-config.glade.h:113
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr "Napomena: neÄ?ete biti upitani za lozinku dok se ne povežete prvi put"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 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 neželjenu poštu."
+msgstr "Opcija se zanemaruje ukoliko je pronaÄ?eno poklapanje sa prilagoÄ?enim zaglavljem za Ä?ubretom."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG IB _kljuÄ?a:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "_Lozinka:"
 
-#: ../mail/mail-config.glade.h:115
-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"
-"Ovo ime Ä?e biti koriÅ¡Ä?eno samo za potrebe prikaza."
+#: ../mail/mail-config.glade.h:119
+#| msgid "Please select among the following options"
+msgid "Please configure the following account settings."
+msgstr "Podesite sledeÄ?e postavke naloga."
 
-#: ../mail/mail-config.glade.h:117
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Unesite podatke o naÄ?inu na koji Ä?ete slati poÅ¡tu. Ako niste sigurni, "
-"pitajte administratora sistema ili prodavca Internet usluga."
+#: ../mail/mail-config.glade.h:120
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
+msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
+msgstr "Unesite dole opisno ime za ovaj nalog. Ovo ime Ä?e biti koriÅ¡Ä?eno samo za potrebe prikaza."
 
-#: ../mail/mail-config.glade.h:118
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Unesite dole ime i elektronsku adresu. â??Neobaveznaâ?? polja dole ne moraju biti "
-"popunjena, osim ako ne želite da ove podatke ukljuÄ?ite u poruke koje Å¡aljete."
+#: ../mail/mail-config.glade.h:121
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Unesite podatke o naÄ?inu na koji Ä?ete slati poÅ¡tu. Ako niste sigurni, pitajte administratora sistema ili prodavca Internet usluga."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Molim izaberite meÄ?u sledeÄ?im moguÄ?nostima"
+#: ../mail/mail-config.glade.h:122
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Unesite dole ime i elektronsku adresu. â??Neobaveznaâ?? polja dole ne moraju biti popunjena, osim ako ne želite da ove podatke ukljuÄ?ite u poruke koje Å¡aljete."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada šalješ poruke samo sa navedenim Bcc primaocima"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "Citirano"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "DomaÄ?in za S_OCKS:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Tr_aži fotografiju pošiljaoca samo u lokalnim adresarima"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "Izab_eri..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
-msgstr "_Pošalji priznanice:"
+msgstr "_Pošalji povratnice:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
-msgstr "_Standardni slovni lik:"
-
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Odabira fasciklu Priprema"
+msgstr "_Standardni font:"
 
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
-msgstr "Izaberite HTML slovni lik fiksirane veliÄ?ine"
+msgstr "Izaberite HTML font fiksirane veliÄ?ine"
 
 #: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
-msgstr "Izaberite HTML slovni lik fiksirane veliÄ?ine za Å¡tampu"
+msgstr "Izaberite HTML font fiksirane veliÄ?ine za Å¡tampu"
 
 #: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
-msgstr "Izaberite HTML slovni lik promenljive veliÄ?ine"
+msgstr "Izaberite HTML font promenljive veliÄ?ine"
 
 #: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
-msgstr "Izaberite HTML slovni lik promenljive veliÄ?ine za Å¡tampu"
-
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Odabira fasciklu Poslato"
+msgstr "Izaberite HTML font promenljive veliÄ?ine za Å¡tampu"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži autentifikaciju"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../mail/mail-config.glade.h:142
+#| msgid "Server _Type: "
+msgid "Server _Type:"
 msgstr "_Tip servera: "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabela potpisa"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "U odgovoru zapoÄ?ni _kucanje na dnu"
 
+#: ../mail/mail-config.glade.h:149
+#| msgid "T_ype: "
+msgid "T_ype:"
+msgstr "T_ip:"
+
 #: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
-msgstr "T_ip: "
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Lista jezika ovde oslikava samo one jezike za koje imate instaliran reÄ?nik."
 
 #: ../mail/mail-config.glade.h:151
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Lista jezika ovde oslikava samo one jezike za koje imate instaliran reÄ?nik."
-
-#: ../mail/mail-config.glade.h:152
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Izlaz ove skripte Ä?e biti koriÅ¡Ä?en kao\n"
-"potpis. Ime koje ste dali Ä?e biti koriÅ¡Ä?eno\n"
-"samo za svrhu prikazivanja na ekranu. "
+"potpis. Ime koje ste dali Ä?e biti koriÅ¡Ä?eno samo za svrhu prikazivanja na ekranu. "
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15015,156 +13653,162 @@ msgstr ""
 "Ukucajte ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: â??Poslovniâ?? ili â??LiÄ?niâ??"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "KorisniÄ?ko_ime:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Koristi aute_ntifikaciju"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:157
+#: ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "KorisniÄ?ko_ime:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "Pro_menljiva veliÄ?ina:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin. "
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
-"Dobro doÅ¡li u pomoÄ?nika Evolucija podeÅ¡avanja poÅ¡te.\n"
+"Dobro doÅ¡li u PomoÄ?nika podeÅ¡avanja poÅ¡te Evolucije.\n"
 "\n"
 "Kliknite â??Napredâ?? za poÄ?etak. "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Uvek uÄ?itavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "_Automatsko podešavanje posrednika:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
-msgstr "_Podrazumevani dodatak za Ä?ubre:"
+msgstr "_Podrazumevani prikljuÄ?ak za Ä?ubre:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Direktna veza sa Internetom"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Outlook kompatibilnost)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Stil _prosleÄ?ivanja:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Zadrži potpis iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_UÄ?itaj slike od kontakata u poruku"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom adresaru"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj podrazumevani nalog"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_RuÄ?no podeÅ¡avanje posrednika:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_OznaÄ?i poruke kao proÄ?itane posle"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne uÄ?itavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Upozori pri slanju HTML pošte kontaktima koji ih ne žele"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Bezbedan HTTP posrednik:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "Izab_eri..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Prikaži _animacije"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Sažmite PRIMA/KOPIJA/NEVIDLJIVA KOPIJA zaglavlja u "
+msgstr "_Sažmi zaglavlja To / Cc / Bcc u "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "_Koristi sistemske postavke"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
-msgstr "_Koristi iste slovne likove kao drugi programi"
+msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "Adrese"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "opis"
 
+# bug: plural-forms
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "sekunde"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -15191,54 +13835,39 @@ msgstr "Sve lokale i aktivne mrežne fascikle"
 
 #: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
-msgstr "Sve lokalnefascikle"
-
-#: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "_Osetljivo na veliÄ?inu slova"
+msgstr "Sve lokalne fascikle"
 
 # timezone.
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
 msgid "Co_mpleted"
 msgstr "Za_vršeno"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "Pro_naÄ?i:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "PronaÄ?i u poruci"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "OznaÄ?i za praÄ?enje"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Ugovor o licenci"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "Ništa nije izabrano"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Sigurnosni podaci"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
-msgstr "Nvedene fascikle"
+msgstr "OdreÄ?ene fascikle"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15246,19 +13875,19 @@ msgstr ""
 "Poruke koje ste izabrali za praÄ?enje su dole izlistane.\n"
 "Izaberite radnju za izvrÅ¡avanje iz menija â??Oznakaâ??."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Rok:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Oznaka:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_naÄ?ite ovo da prihvatite ugovor o licenci"
 
@@ -15267,133 +13896,138 @@ msgstr "Oz_naÄ?ite ovo da prihvatite ugovor o licenci"
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Uzimanje pošte"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlazeÄ?ih filtera: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574
+#: ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 "Neuspelo dopunjavanje u %s: %s\n"
-"Dopunjavanje u lokalnu fasciklu â??Poslatoâ??."
+"Dopunjavanje u lokalnu fasciklu â??Poslatoâ??."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Neuspelo dopunjavanje u lokalnu fasciklu â??Poslatoâ??: %s"
+msgstr "Neuspelo dopunjavanje u lokalnu fasciklu â??Poslatoâ??: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Slanje poruke %d od %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Neuspelo slanje %d od %d poruka"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "Ä?uvanje poruke u fasciklu"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštanje poruka u %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Umnožavanje poruka u %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "ProsleÄ?ene poruke"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaranje fascikle %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Dobijam podatke o kvoti za fasciklu %s"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaranje ostave %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjanje fascikle %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "SmeÅ¡tanje fascikle â??%sâ??"
+msgstr "SmeÅ¡tanje fascikle â??%sâ??"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "Pražnjenje i smeÅ¡tanje naloga â??%sâ??"
+msgstr "Pražnjenje i smeÅ¡tanje naloga â??%sâ??"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
-msgstr "SmeÅ¡tanje naloga â??%sâ??"
+msgstr "SmeÅ¡tanje naloga â??%sâ??"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Osvežavanje fascikle"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693
+#: ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Pražnjenje fascikle"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Izbacivanje smeÄ?a u â??%sâ??"
+msgstr "Izbacivanje smeÄ?a u â??%sâ??"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Lokalne fascikle"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "DovlaÄ?enje poruke %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15401,7 +14035,7 @@ msgstr[0] "DovlaÄ?enje %d poruke"
 msgstr[1] "DovlaÄ?enje %d poruke"
 msgstr[2] "DovlaÄ?enje %d poruka"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15409,7 +14043,7 @@ msgstr[0] "Ä?uvanje %d poruke"
 msgstr[1] "Ä?uvanje %d poruke"
 msgstr[2] "Ä?uvanje %d poruka"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15418,11 +14052,12 @@ msgstr ""
 "GreÅ¡ka pri Ä?uvanju poruke u: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "Ä?uvanje priloga"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15431,33 +14066,33 @@ msgstr ""
 "Nije moguÄ?e pravljenje izlazne datoteke: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nije moguÄ? upis podataka: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidanje veze sa %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovno povezivanje na %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Priprema nalog â??%sâ?? za rad van mreže"
+msgstr "Priprema nalog â??%sâ?? za rad van mreže"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
-msgstr "Provera usluge"
+msgstr "Provera servisa"
 
 #: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
-msgstr "Odustajanje je u toku..."
+msgstr "Otkazivanje..."
 
 #: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
@@ -15465,65 +14100,66 @@ msgstr "Slanje i primanje pošte"
 
 #: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
-msgstr "Obustavi _sve"
+msgstr "Otkaži _sve"
 
 #: ../mail/mail-send-recv.c:503
 msgid "Updating..."
-msgstr "Osvežavanje..."
+msgstr "Ažuriranje..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Ä?ekanje..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "Provera za nove poruke"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
-msgstr "Korisnik je obustavio operaciju."
+msgstr "Korisnik je otkazao operaciju."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "_SaÄ?uvaj i zatvori"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
-msgstr "UreÄ?uje potpis"
+msgstr "Uredi potpis"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "Naziv _potpisa:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Nije moguÄ?e pravljenje direktorijuma za pripremu â??%sâ??: %s"
+msgstr "Nije moguÄ?e pravljenje direktorijuma za pripremu â??%sâ??: %s"
 
 #: ../mail/mail-tools.c:150
 #, 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Å¡ava premeÅ¡tanje poÅ¡te iz ne-mbox izvora â??%sâ??"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -15537,28 +14173,28 @@ msgstr "ProsleÄ?ena poruka"
 #: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
-msgstr "Neispravna fascikla â??%sâ??"
+msgstr "Neispravna fascikla â??%sâ??"
 
 #: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Podešavanje fascikle pretrage: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Osvežavanje fascikla pretrage za â??%s: %sâ??"
+msgstr "Ažuriranje fascikla pretrage za â??%s: %sâ??"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Osvežavanje fascikla pretrage za â??%sâ??"
+msgstr "Ažuriranje fascikla pretrage za â??%sâ??"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
@@ -15575,34 +14211,24 @@ msgstr "Fascikla imena â??{1}â?? veÄ? postoji. Dodelite drugi naziv."
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "Fascikla sa sadržajem na â??{1}â?? veÄ? postoji.\n"
 "\n"
-"Možete ili da ignorišete ovu fasciklu, prepišete je ili dopunite njen "
-"sadržaj, ili izaÄ?ete."
+"Možete ili da ignoriÅ¡ete ovu fasciklu, prepiÅ¡ete je ili dopunite njen sadržaj, ili izaÄ?ete."
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr "Priznanica je zatražena za â??{1}â??. Poslati priznanicu za {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgstr "Povratnica je zatražena za â??{1}â??. Poslati povratnicu za {0}?"
 
 # mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "Potpis nazvan â??{0}â?? veÄ? postoji. Navedite drugo ime."
 
 #: ../mail/mail.error.xml.h:8
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Dodavanjem smislenog naslova vaÅ¡im porukama daÄ?ete primaocima do znanja o Ä?emu "
-"pišete."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Dodavanjem smislenog naslova porukama daÄ?ete primaocima do znanja o Ä?emu piÅ¡ete."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15613,8 +14239,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Sigurno želite da iskljuÄ?ite ovaj nalog i obriÅ¡ete sve posrednike?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15622,16 +14247,11 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Sigurno želite da otvorite {0} poruka odjednom?"
 
 #: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
 msgstr "Želite li trajno da uklonite sve obrisane poruke iz fascikle â??{0}â???"
 
 #: ../mail/mail.error.xml.h:15
@@ -15712,12 +14332,8 @@ msgid "Cannot open target \"{2}\"."
 msgstr "Nije moguÄ?e otvoriti cilj â??{2}â??."
 
 #: ../mail/mail.error.xml.h:34
-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."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "Nije moguÄ?e proÄ?itati datoteku licence â??{0}â??, zbog problema sa instalacijom. NeÄ?ete moÄ?i da koristite ovog pružaoca dok ne prihvatite licencu."
 
 # mail:no-rename-folder primary
 #: ../mail/mail.error.xml.h:35
@@ -15752,12 +14368,8 @@ msgid "Check Junk Failed"
 msgstr "Provera neželjene pošte nije uspela"
 
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Proverite da li ste ispravno otkucali lozinku. Ne zaboravite da je u veÄ?ini "
-"lozinki veliÄ?ina slova bitna; možda su ukljuÄ?ena velika slova."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Proverite da li ste ispravno otkucali lozinku. Ne zaboravite da je u veÄ?ini lozinki veliÄ?ina slova bitna; možda su ukljuÄ?ena velika slova."
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
@@ -15796,12 +14408,8 @@ msgid "Do not disable"
 msgstr "Nemoj iskljuÄ?iti"
 
 #: ../mail/mail.error.xml.h:52
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
-"Želite li lokalno da uskladite fascikle koje su oznaÄ?ene za koriÅ¡Ä?enje van "
-"mreže?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+msgstr "Želite li lokalno da uskladite fascikle koje su oznaÄ?ene za koriÅ¡Ä?enje van mreže?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15841,12 +14449,8 @@ 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
-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."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr "Ukoliko obriÅ¡ete fasciklu, sav njen sadržaj i sadržaj podfascikli Ä?e biti trajno obrisani."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15865,12 +14469,8 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci naloga biÄ?e trajno obrisani."
 
 #: ../mail/mail.error.xml.h:67
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Ukoliko izaÄ?ete, ove poruke neÄ?e biti poslate dok ponovo ne pokrenete "
-"Evoluciju."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "Ukoliko izaÄ?ete, ove poruke neÄ?e biti poslate dok ponovo ne pokrenete Evoluciju."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15882,18 +14482,11 @@ msgstr "Neispravna autentifikacija"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
-msgstr "Filteri pošte su automatski osveženi."
+msgstr "Filteri pošte su automatski ažurirani."
 
 #: ../mail/mail.error.xml.h:72
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
-"BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
-"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Mnogi sistemi e-poÅ¡te dodaju zaglavlje Izgleda-prima porukama koje imaju samo BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
@@ -15917,20 +14510,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 "Molim odobrite nalog ili poÅ¡aljite koriÅ¡Ä?enjem nekog drugog."
+msgstr "OmoguÄ?ite nalog ili poÅ¡aljite koriÅ¡Ä?enjem drugog naloga."
 
 #: ../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."
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+msgstr "Unesite važeÄ?u elektronsku adresu u polje Prima:. Možete pretražiti elektronske adrese klikom na dugme Prima: pored polja za unos."
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
 "Proverite da li sledeÄ?i primaoci žele i mogu da prime HTML poÅ¡tu:\n"
@@ -15938,7 +14526,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
-msgstr "Molim dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
+msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Please wait."
@@ -15958,7 +14546,7 @@ msgstr "Slanje upita serveru za listu podržanih mehanizama autentifikacije."
 
 #: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
-msgstr "Zatražene priznanice."
+msgstr "Zatražene povratnice."
 
 #: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
@@ -15966,20 +14554,20 @@ msgstr "Zaista obrisati fasciklu â??{0}â?? i sve podfascikle?"
 
 #: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
-msgstr "Izveštavanje za neželjenu poštu nije uspelo"
+msgstr "IzveÅ¡tavanje za Ä?ubre nije uspelo"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr "Izveštavanje da nije neželjena pošta neuspelo"
+msgstr "IzveÅ¡tavanje da nije Ä?ubre neuspelo"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
-msgstr "Fascikle pretrage su automatski osvežene."
+msgstr "Fascikle pretrage su automatski ažurirane."
 
 # bug(slobo): verovatno izveštaj o dostavi
 #: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
-msgstr "Pošalji priznanicu"
+msgstr "Pošalji povratnicu"
 
 #: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
@@ -15991,32 +14579,23 @@ msgstr "Uskladi"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
-msgstr "Uskladiti fascikle lokalno za rad van mreže."
+msgstr "Uskladiti fascikle lokalno za rad van mreže?"
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
 #: ../mail/mail.error.xml.h:97
-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."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Sistemske fascikle neophodne da bi Evolucija ispravno radila se ne mogu preimenovati, premestiti ili obrisati."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
-"Lista kontakata kojoj šaljete je podešena da skriva primaoce liste.\n"
+"Kontakat lista kojoj šaljete je podešena da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
-"BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
-"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+"Mnogi sistemi e-poÅ¡te dodaju zaglavlje Izgleda-prima porukama koje imaju samo BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
 #: ../mail/mail.error.xml.h:101
 msgid ""
@@ -16030,7 +14609,7 @@ msgstr ""
 "{0}\n"
 "Koristi sada uklonjenu fasciklu:\n"
 "    â??{1}â??\n"
-"I sada je(su) osvežena(e)."
+"I sada je(su) ažurirana(e)."
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
@@ -16044,7 +14623,7 @@ msgstr ""
 "{0}\n"
 "Koristi sada uklonjenu fasciklu:\n"
 "    â??{1}â??\n"
-"I sada je(su) osveženo(a)."
+"I sada je(su) ažurirano(a)."
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -16059,46 +14638,32 @@ msgstr ""
 "idite u ureÄ?ivaÄ? fascikle pretrage i dodajte je izriÄ?ito, ako želite."
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Ova poruka se ne može poslati poÅ¡to je iskljuÄ?en nalog sa kojeg Å¡aljete"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Ova poruka se ne može poslati pošto niste naveli nijednog primaoca"
 
 #: ../mail/mail.error.xml.h:116
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Ovaj server ne podržava traženi tip autentifikacije i možda uopšte ne "
-"podržava autentifikaciju."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "Ovaj server ne podržava traženi tip autentifikacije i možda uopšte ne podržava autentifikaciju."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije saÄ?uvan."
 
 #: ../mail/mail.error.xml.h:118
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Ovo oznaÄ?ava sve poruke kao proÄ?itane u izabranoj fascikli i podfasciklama."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgstr "Ovo oznaÄ?ava sve poruke kao proÄ?itane u izabranoj fascikli i podfasciklama."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Neuspelo povezivanje na GroupWise server."
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nije moguÄ?e otvaranje fascikle za pripremu za ovaj nalog.  Koristiti "
-"sistemsku fasciklu za pripremu?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr "Nije moguÄ?e otvaranje fascikle nacrta za ovaj nalog. Koristiti sistemsku fasciklu nacrta?"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -16110,16 +14675,14 @@ msgstr "Koristi _podrazumevano"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
-msgstr "Koristiti podrazumevanu fasciklu za pripremu?"
+msgstr "Koristiti podrazumevanu fasciklu nacrta?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Upozorenje: brisanje poruka iz fascikle pertrage Ä?e obrisati samu poruku sa "
-"njene lokacije u fascikli.\n"
+"Upozorenje: brisanje poruka iz fascikle pretrage Ä?e obrisati samu poruku sa njene lokacije u fascikli.\n"
 "Želite li ovo da uradite?"
 
 #: ../mail/mail.error.xml.h:127
@@ -16145,12 +14708,10 @@ msgstr "Morate navesti fasciklu."
 #: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "Morate navesti bar jednu fasciklu kao izvor.\n"
-"Bilo pojedinaÄ?nim izborom fascikli, i/ili izborom svih lokalnih fascikli, "
-"svih mrežnih fascikli ili i jednih i drugih."
+"Bilo pojedinaÄ?nim izborom fascikli, i/ili izborom svih lokalnih fascikli, svih mrežnih fascikli ili i jednih i drugih."
 
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
@@ -16176,87 +14737,89 @@ msgstr "Iz_baci"
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "NeviÄ?eno"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "ViÄ?eno"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "ProsleÄ?eno"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ViÅ¡estruke neviÄ?ene poruke"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Više"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1661
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Danas %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "JuÄ?e %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4456
+#: ../mail/message-list.c:3987
+#: ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4295
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"Nema poruke sa zadatim uslovim pretrage. Možete oÄ?istiti pretragu iz menija "
-"Pretraga->OÄ?isti ili je izmeniti."
+#: ../mail/message-list.c:4299
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "Nema poruke sa zadatim uslovim pretrage. Možete oÄ?istiti pretragu iz menija Pretraga->OÄ?isti ili je izmeniti."
 
-#: ../mail/message-list.c:4297
+#: ../mail/message-list.c:4301
+msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+msgstr "U ovoj su fascikli samo skrivene slike. Da bi ih videli, upotrebite Pregled->Prikaži skrivene slike."
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -16282,51 +14845,54 @@ msgstr "Primljeno"
 
 #: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr "_Pošalji poruke"
+msgstr "Poslate poruke"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "VeliÄ?ina"
 
 #: ../mail/message-list.etspec.h:19
-#, fuzzy
 msgid "Subject - Trimmed"
-msgstr "Polje za _temu"
+msgstr "Naslov - skraÄ?eno"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Poziv"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ne prosleÄ?uj"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
-msgstr "Za vašu informaciju"
+msgstr "Za Vašu informaciju"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "ProÄ?itati"
 
@@ -16351,39 +14917,37 @@ msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "Tema ili primaoci sadrže"
+#| msgid "Subject or Sender contains"
+msgid "Subject or Addresses contains"
+msgstr "Naslov ili adrese sadrže"
 
 #: ../mail/searchtypes.xml.h:7
+msgid "Subject or Recipients contains"
+msgstr "Naslov ili primaoci sadrže"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Naslov ili pošiljalac sadrže"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Lokalni imenici"
+#| msgid "List local address book folders"
+msgid "Add local address books to Evolution."
+msgstr "Dodaje lokalne adresare u Evoluciju."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "ObezbeÄ?uje osnovnu funkcionalnost za lokalne imenike."
+msgid "Local Address Books"
+msgstr "Lokalni adresari"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr ""
-"Spisak predmeta za kojima Ä?e dodatak za podseÄ?anje ukljuÄ?ivanja priloga tragati "
-"u telu poruke"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr "Spisak predmeta za kojima Ä?e prikljuÄ?ak za podseÄ?anje ukljuÄ?ivanja priloga tragati u telu poruke"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Spisak predmeta za kojima Ä?e prikljuÄ?ak za podseÄ?anje ukljuÄ?ivanja priloga "
-"tragati u telu poruke"
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "Spisak predmeta za kojima Ä?e prikljuÄ?ak za podseÄ?anje ukljuÄ?ivanja priloga tragati u telu poruke."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "KljuÄ?ne reÄ?i"
 
@@ -16393,43 +14957,35 @@ msgid "Attachment Reminder"
 msgstr "Podsetnik na priloge"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr ""
-"Traga za predmetima u kojima se može nalaziti prilog u poruci i upozorava "
-"ukoliko priloga nema"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "PodseÄ?a kada zaboravite da dodate prilog u poruku."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
-msgstr ""
-"Evolucija je pronaÅ¡la neke kljuÄ?ne reÄ?i koje navode da bi poruka trebalo da "
-"sadrži prilog, ali isti ne može da pronaÄ?e."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr "Evolucija je pronaÅ¡la neke kljuÄ?ne reÄ?i koje navode da bi poruka trebalo da sadrži prilog, ali isti ne može da pronaÄ?e."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
 msgstr "Poruka nema priloge"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Dodaj prilog..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Uredi poruku"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"Dodatak za oblikovanje koji prikazuje zvuÄ?ne priloge unutar poruke i "
-"dozvoljava njihovo puštanje direktno iz evolucije."
+#| msgid "Audio inline plugin"
+msgid "Audio Inline"
+msgstr "Audio unutar"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Dodatak za zvuk unutar poruke"
+msgid "Play audio attachments directly from Evolution."
+msgstr "Pušta audio priloge direktno iz Evolucije."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite ime za rezervnu kopiju Evolucije"
 
@@ -16450,163 +15006,152 @@ msgid "Restore from backup"
 msgstr "VraÄ?a iz rezervne kopije"
 
 #: ../plugins/backup-restore/backup-restore.c:289
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
-msgstr ""
-"Evoluciju možete povratiti iz rezervne kopije. Možete povratiti poštu, "
-"kalendare, zaduženja, beleške, kontakte.\n"
-"TakoÄ?e se  mogu povratiti sva liÄ?na podeÅ¡avanja, filteri za poÅ¡tu, itd."
-
-#: ../plugins/backup-restore/backup-restore.c:295
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
+msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+msgstr "Evoluciju možete povratiti iz rezervne kopije. Možete povratiti poÅ¡tu, kalendare, zadatke, beleÅ¡ke, kontakte. TakoÄ?e se  mogu povratiti sve liÄ?ne postavke, filteri za poÅ¡tu, itd."
+
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Povrati Evoluciju iz datoteke rezervne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Izaberite arhivu Evolucije za povraÄ?aj:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Izaberite datoteku za povraÄ?aj"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraÄ?aj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Proverava rezervnu kopiju Evolucije"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Ponovo pokreÄ?e Evoluciju"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Sa grafiÄ?kom okruženjem"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Gašenje Evolucije"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
-msgstr "IzraÄ?uje rezervnu kopiju naloga i podeÅ¡avanja Evolucije"
+msgstr "IzraÄ?uje rezervnu kopiju naloga i postavke Evolucije"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zaduženja, "
-"beleške)"
+msgstr "Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zadaci, beleške)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Izrada rezervne kopije završena"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "IzraÄ?uje rezervnu kopiju trenutnih podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Otpakivanje datoteka iz rezervne kopije"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "UÄ?itava podeÅ¡avanja Evolucije"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Uklanjanje privremenih rezervnih datoteka"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Osiguranje lokalnih izvora"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Smešta rezervnu kopiju u fasciklu %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "VrÅ¡i povraÄ?aj iz fascikle %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Rezervna kopija Evolucije"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "PovraÄ?aj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "IzraÄ?uje rezervnu kopiju podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "SaÄ?ekajte dok Evolucija pravi rezervnu kopiju podataka."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "PovraÄ?aj podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "SaÄ?ekajte dok Evolucija vraÄ?a podatke u prvobitno stanje."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 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."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Dodatak za izradu rezerve i oporavak podataka i podešavanja Evolucije."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#| msgid "Backup and restore plugin"
+msgid "Backup and Restore"
+msgstr "Izrada rezerve i oporavak"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Dodatak za izradu rezerve i oporavak"
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Pravi rezervu i oporavlja podatke i postavke Evolucije."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "Sigurno želite da zatvorite Evoluciju?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Sigurno želite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Sigurno želite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Izrada rezervne kopije može biti pokrenuta samo kada Evolucija ne radi. Pre "
-"nego Å¡to nastavite, proverite da li ste saÄ?uvali i zatvorili sve prozore u "
-"kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon "
-"zavrÅ¡etka procedure, oznaÄ?ite ovu opciju."
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Izrada rezervne kopije može biti pokrenuta samo kada Evolucija ne radi. Pre nego Å¡to nastavite, proverite da li ste saÄ?uvali i zatvorili sve prozore u kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon zavrÅ¡etka procedure, oznaÄ?ite ovu opciju."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -16625,98 +15170,95 @@ msgid "The selected folder is not writable."
 msgstr "U izabranu fasciklu se ne može pisati."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
-msgstr ""
-"Ovo Ä?e obrisati sve trenutne podatke i podeÅ¡avanja Evolucije i povratiti ih "
-"iz rezervne kopije. Ova procedura se može pokrenuti samo kada Evolucija ne "
-"radi. Pre nego Å¡to nastavite, proverite da li ste zatvorili sve prozore u "
-"kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon "
-"zavrÅ¡etka procedure, oznaÄ?ite ovu opciju."
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr "Ovo Ä?e obrisati sve trenutne podatke i postavke Evolucije i povratiti ih iz rezervne kopije. Ova procedura se može pokrenuti samo kada Evolucija ne radi. Pre nego Å¡to nastavite, proverite da li ste zatvorili sve prozore u kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon zavrÅ¡etka procedure, oznaÄ?ite ovu opciju."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
-msgstr "Pravi rezervu i oporavlja podatke i podešavanja Evolucije"
+msgstr "Pravi rezervu i oporavlja podatke i postavke Evolucije"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
-msgstr "Op_oravlja podešavanja..."
+msgstr "Op_oravlja postavke..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
-msgstr "_IzraÄ?uje rezervu podeÅ¡avanja..."
+msgstr "_IzraÄ?uje rezervu postavki..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622
+#: ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "_Automatski napravi unose u adresar pri odgovaranju na poruke"
+#: ../plugins/bbdb/bbdb.c:646
+#| msgid "_Auto-create address book entries when replying to messages"
+msgid "Create _address book entries when sending mails"
+msgstr "Pravi unose u _adresar pri slanju pošte"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
-msgstr "Izaberi imenik za Automatske kontakte"
+msgstr "Izaberi adresar za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Brze poruke"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "UsklaÄ?uje podatke o kontaktima i slikama sa listom drugara u Pidžinu"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za Pidgin listu prijatelja"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"Automatski popunjava adresar imenima i adresama e-pošte kada odgovarate na "
-"poruke. TakoÄ?e popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
-
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#| msgid ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+msgstr ""
+"OslobaÄ?a Vas teÅ¡kog rada u upravljanju adresarom.\n"
+"\n"
+"Automatski popunjava adresar imenima i adresama e-poÅ¡te kada odgovarate na poruke. TakoÄ?e popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
+
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Došlo je do greške u pripremi %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Zavisan proces Bogofiltera ne reaguje, gasim..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Ä?ekanje na zavisan proces Bogofiltera ometeno, prekidam..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Cev ka Bogofilteru je pukla, oznaka greške: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Prebaci tekst poruke u _Unikod"
 
@@ -16725,81 +15267,125 @@ msgid "Convert mail messages to Unicode"
 msgstr "Prebacuje poruke pošte u Unikod"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta "
-"Ä?iji su uzrok razliÄ?iti kodni rasporedi."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta Ä?iji su uzrok razliÄ?iti kodni rasporedi."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Opcije Bogofiltera"
+#| msgid "Bogofilter junk plugin"
+msgid "Bogofilter Junk Filter"
+msgstr "Filter neželjene pošte Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "PrikljuÄ?ak za neželjenu poÅ¡tu Bogofilter"
+msgid "Bogofilter Options"
+msgstr "Opcije Bogofiltera"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "Filtrira neželjenu poÅ¡tu koriÅ¡Ä?enjem Bogofiltera."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_Adresa :"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Koristi Å¡ifrovanu vezu"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "O_sveži:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "nedelje"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV izvori kalendara"
+msgid "Add CalDAV support to Evolution."
+msgstr "Dodaje podršku za CalDAV u Evoluciju."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV izvori"
+#| msgid "CalDAV sources"
+msgid "CalDAV Support"
+msgstr "Podrška za CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:208
+#| msgid "Customize"
+msgid "_Customize options"
+msgstr "_Prilagodi opcije"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+#| msgid "File name:"
+msgid "File _name:"
+msgstr "_Ime datoteke:"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#| msgid "Choose a file"
+msgid "Choose calendar file"
+msgstr "Izaberite datoteku kalendara"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#| msgid "Open"
+msgid "On open"
+msgstr "Pri otvaranju"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "Kod izmene datoteke"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../plugins/calendar-file/calendar-file.c:281
+#| msgid "Personal"
+msgid "Periodically"
+msgstr "PeriodiÄ?no"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "Forsira _samo za Ä?itanje"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Lokalni kalendari"
+msgid "Add local calendars to Evolution."
+msgstr "Dodaje lokalne kalendare u Evoluciju."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Daje osnovnu upotrebu lokalnim kalendarima."
+msgid "Local Calendars"
+msgstr "Lokalni kalendari"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Koristi sigurnu vezu"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "KorisniÄ?ko_ime:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP Kalendari"
+msgid "Add web calendars to Evolution."
+msgstr "Dodaje veb kalendare u Evoluciju."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Daje osnovnu upotrebu http kalendarima i onim na vebu."
+#| msgid "Calendars"
+msgid "Web Calendars"
+msgstr "Veb kalendari"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16841,80 +15427,76 @@ msgstr "Vreme: grmljavine"
 msgid "Select a location"
 msgstr "Izaberite mesto"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Jedinice:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MetriÄ?ne (Celzijus, cm, itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperijalne (Farenhajt, inÄ?i, itd.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Daje osnovnu upotrebu kalendarima vremena."
+msgid "Add weather calendars to Evolution."
+msgstr "Dodaje kalendare za vreme u Evoluciju."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Kalendari vremena"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"Probni dodatak koji pokazuje iskaÄ?uÄ?i meni za umnožavanje stvari u listu "
-"iseÄ?aka."
+#| msgid "Copy tool"
+msgid "Copy Tool"
+msgstr "Alat za umnožavanje"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Alat za umnožavanje"
+#| msgid "Copy selection to clipboard"
+msgid "Copy things to the clipboard."
+msgstr "Umnožava stvari u spisak iseÄ?aka."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Proveri da li je Evolucija podrazumevani program za poštu"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Svaki put kada se Evolucija pokrene, proveri da li je podrazumevani program "
-"za poštu."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Svaki put kada se Evolucija pokrene, proveri da li je podrazumevani program za poštu."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Pri pokretanju proverava da li je Evolucija podrazumevani klijent za poštu."
+#| msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Pri pokretanju proverava da li je Evolucija podrazumevani klijent za poštu."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "Podrazumevani klijentza poštu "
+#| msgid "Default Mail Client "
+msgid "Default Mail Client"
+msgstr "Podrazumevani klijent za poštu "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Želite li da Evoluciju uÄ?inite podrazumevanim klijentom e-poÅ¡te?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "OznaÄ?ava kao _podrazumevan adresar"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "OznaÄ?ava kao _podrazumevan kalendar"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
-msgstr "OznaÄ?ava kao _podrazumevan spisak zaduženja"
+msgstr "OznaÄ?ava kao _podrazumevan spisak zadataka"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "OznaÄ?ava kao _podrazumevan spisak beleÅ¡ki"
 
@@ -16923,43 +15505,39 @@ msgid "Default Sources"
 msgstr "Podrazumevani izvori"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr ""
-"ObezbeÄ?uje funkcionalnost za obeležavanje nekog kalendara ili imenika kao "
-"podrazumevanog."
+msgid "Mark your preferred address book and calendar as default."
+msgstr "OznaÄ?ava omiljen adresar i kalendar kao podrazumevane."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "Sigurnost:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Nerazvrstano"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "ZaÅ¡tiÄ?eno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "Tajno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "Strogo tajno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_PrilagoÄ?eno zaglavlje"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "KljuÄ?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -16978,8 +15556,9 @@ msgstr "PrilagoÄ?eno zaglavlje e-poÅ¡te"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "Dodaje prilagoÄ?eno zaglavlje odlaznim porukama."
+#| msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Dodaje prilagoÄ?ena zaglavlja odlaznim porukama."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16990,14 +15569,8 @@ msgid "List of Custom Headers"
 msgstr "Spisak prilagoÄ?enih zaglavlja"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"KljuÄ? navodi spisak prilagoÄ?enih zaglavlja koje možete dodati odlaznoj poruci. "
-"Format za navoÄ?enje zaglavlja i njegove vrednosti je: naziv prilagoÄ?enog "
-"zaglavlja, zatim â??=â?? i vrednosti odvojene sa â??;â??"
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgstr "KljuÄ? navodi spisak prilagoÄ?enih zaglavlja koje možete dodati odlaznoj poruci. Format za navoÄ?enje zaglavlja i njegove vrednosti je: naziv prilagoÄ?enog zaglavlja, zatim â??=â?? i vrednosti odvojene sa â??;â??"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -17022,30 +15595,22 @@ msgstr "Sigurna lozinka"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Ova opcija Ä?e povezati na Exchange server koriÅ¡Ä?enjem prijave sigurnom "
-"lozinkom (NTLM)."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "Ova opcija Ä?e povezati na Exchange server koriÅ¡Ä?enjem prijave sigurnom lozinkom (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Tekstualna lozinka"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Ova opcija Ä?e povezati na Exchange server koriÅ¡Ä?enjem prijave tekstualnom "
-"lozinkom."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "Ova opcija Ä?e povezati na Exchange server koriÅ¡Ä?enjem prijave tekstualnom lozinkom."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Van kancelarije"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -17053,90 +15618,93 @@ msgstr ""
 "Dole izabrana poruka Ä?e biti automatski poslata svakoj osobi \n"
 "koja Vam pošalje poštu dok ste van kancelarije."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Nisam u kancelariji"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "U kancelariji sam"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Unesite lozinku za nalog Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Izmenite lozinku"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
-msgstr "Upravljajte podešavanjima delegata za nalog Exchange"
+msgstr "Upravljajte postavkama delegata za nalog Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "PomoÄ?nik za delegiranje"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Razno"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Pregledaj veliÄ?ine svih Exchange fascikli"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "VeliÄ?ina fascikli"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
-msgstr "Exchange podešavanja"
+msgstr "Exchange postavke"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA adresa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "A_utentifikuj"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "Naziv sanduÄ?eta je _drugaÄ?iji od korisniÄ?kog imena"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_SanduÄ?e:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "Tip _autentifikacije"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "_Proveri podržane tipove"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "VeliÄ?ina:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17144,18 +15712,14 @@ msgid ""
 "Please switch to online mode for such operations."
 msgstr ""
 "Evolucija nije na mreži. Sada ne možete niti praviti niti menjati fascikle.\n"
-"Molim povežite se na mrežu za takve radnje."
+"Povežite se na mrežu za takve radnje."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"Trenutna lozinka ne odgovara postojeÄ?oj lozinki za ovaj nalog. Unesite "
-"ispravnu lozinku"
+msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgstr "Trenutna lozinka ne odgovara postojeÄ?oj lozinki za ovaj nalog. Unesite ispravnu lozinku"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -17178,40 +15742,37 @@ msgid "Your current password has expired. Please change your password now."
 msgstr "Trenutna lozinka je istekla. Izmenite lozinku sada."
 
 # bug(slobo): plural-forms
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Broj dana nakon kojih VaÅ¡a lozinka istiÄ?e: %d"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "PrilagoÄ?eno"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "UreÄ?ivaÄ? (Ä?ita, pravi, ureÄ?uje)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Autor (Ä?ita, pravi)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Recenzent (samo Ä?ita)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Delegiraj ovlaÅ¡Ä?enja"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "OvlaÅ¡Ä?enja za %s"
@@ -17219,96 +15780,104 @@ msgstr "OvlaÅ¡Ä?enja za %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"Ovu poruku je Evolucija automatski poslala da bi Vas obavestila da ste "
-"odreÄ?eni za delegata. Sada možete slati poruke u moje ime."
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
+msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
+msgstr "Ovu poruku je Evolucija automatski poslala da bi Vas obavestila da ste odreÄ?eni za delegata. Sada možete slati poruke u moje ime."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "Dodeljena su Vam sledeÄ?a ovlaÅ¡Ä?enja na mojim fasciklama:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
-msgstr "TakoÄ?e Vam je dozvoljeno da vidite moje privatne stvari."
+msgstr "TakoÄ?e Vam je dozvoljeno da vidite moje privatne stavke."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
-msgstr "Niste ovlaÅ¡Ä?eni, meÄ?utim, da vidite moje privatne podatke."
+msgstr "Niste ovlaÅ¡Ä?eni, meÄ?utim, da vidite moje privatne stavke."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "%s Vas je odredio za svog delegata"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Delegiraj"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Ukloniti delegata %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Nije moguÄ?e pristupiti aktivnom direktorijumu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Nije moguÄ?e pronaÄ?i sebe u aktivnom direktorijumu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Nije moguÄ?e pronaÄ?i delegata %s u aktivnom direktorijumu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Nije moguÄ?e ukloniti delegata %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Nije moguÄ?e osvežiti listu delegata."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Nije moguÄ?e dodati delegata %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "GreÅ¡ka pri Ä?itanju liste delegata."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "K_alendar:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "Ko_ntakti: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Delegati"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"Ništa\n"
+"PregledaÄ? (samo-Ä?ita)\n"
+"Autor (Ä?ita, pravi)\n"
+"UreÄ?ivaÄ? (Ä?ita, pravi, ureÄ?uje)"
+
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "OvlaÅ¡Ä?enja za"
 
@@ -17322,7 +15891,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "_Delegati mogu da vide liÄ?ne predmete"
+msgstr "_Delegati mogu da vide liÄ?ne stavke"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -17331,12 +15900,13 @@ msgstr "_SanduÄ?e:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:18
 msgid "_Summarize permissions"
-msgstr "SaÄ?ini _pregled ovlaÅ¡Ä?enja"
+msgstr "SaÄ?ini _sažetak ovlaÅ¡Ä?enja"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
-msgstr "Za_duženja:"
+msgstr "Za_daci:"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
@@ -17354,11 +15924,11 @@ msgid "Folder Size"
 msgstr "VeliÄ?ina fascikle"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "Korisnik"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Prijavi se na fasciklu drugog korisnika"
@@ -17367,20 +15937,20 @@ msgstr "Prijavi se na fasciklu drugog korisnika"
 msgid "Exchange Folder Tree"
 msgstr "Stablo Exchange fascikli"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Odjavi fasciklu..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Zaista se odjaviti sa fascikle â??%sâ??"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Odjavi se sa fascikle â??%sâ??"
@@ -17405,12 +15975,10 @@ msgstr "<b>Status:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>Dole izabrana poruka Ä?e biti automatski poslata svakoj osobi koja Vam "
-"pošalje\n"
+"<small>Dole izabrana poruka Ä?e biti automatski poslata svakoj osobi koja Vam poÅ¡alje\n"
 "poštu dok niste u kancelariji.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -17423,7 +15991,7 @@ msgstr "Trenutno nisam u kancelariji"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
-msgstr "Ne, ne menjaj stanje"
+msgstr "Ne, ne menjaj status"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
@@ -17439,7 +16007,7 @@ msgstr "Upozorenje o isteku lozinke..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "VaÅ¡a lozinke istiÄ?e za 7 dana..."
+msgstr "VaÅ¡a lozinka istiÄ?e za 7 dana..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -17447,18 +16015,18 @@ msgstr "Izmenite lo_zinku"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Zabranjen pristup.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Dodaj korisnika:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Dodaje korisnika"
 
@@ -17476,7 +16044,7 @@ msgstr "Nije moguÄ?e urediti"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Create items"
-msgstr "Pravi predmete"
+msgstr "Pravi stavke"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create subfolders"
@@ -17484,19 +16052,19 @@ msgstr "Pravi podfascikle"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
-msgstr "Obriši sve predmete"
+msgstr "Obriši sve stavke"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
-msgstr "Obriši svoje predmete"
+msgstr "Obriši svoje stavke"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
-msgstr "Uredi sve predmete"
+msgstr "Uredi sve stavke"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
-msgstr "Uredi svoje predmete"
+msgstr "Uredi svoje stavke"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Folder contact"
@@ -17512,7 +16080,7 @@ msgstr "Vidljiva fascikla"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
-msgstr "Predmeti za Ä?itanje"
+msgstr "Stavke za Ä?itanje"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Role: "
@@ -17520,7 +16088,7 @@ msgstr "Uloga: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
-msgstr "<b>Podešavanja poruke</b>"
+msgstr "<b>Postavke poruke</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:2
 msgid "<b>Tracking Options</b>"
@@ -17558,11 +16126,11 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:12
 msgid "Request a _delivery receipt for this message"
-msgstr "Zahtevaj_priznanicu da je isporuÄ?ena za ovu poruku"
+msgstr "Zahtevaj_povratnicu da je isporuÄ?ena za ovu poruku"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:13
 msgid "Request a _read receipt for this message"
-msgstr "Zahtevaj _priznanicu  da je proÄ?itana za ovu poruku"
+msgstr "Zahtevaj _povratnicu  da je proÄ?itana za ovu poruku"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
 msgid "Send as Delegate"
@@ -17576,13 +16144,13 @@ msgstr "_Osetljivost: "
 msgid "_User"
 msgstr "_Korisnik"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Izaberite korisnika"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
-msgstr "Imenik..."
+msgstr "Adresar..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -17593,12 +16161,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Prijavi se na kalendar drugog korisnika"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"PrikljuÄ?ak koji rukuje zbirkom naroÄ?itih radnji i svojstava nad nalozima za "
-"Exchange."
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "Aktivira paket proširenja Evolution-Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17606,7 +16170,7 @@ msgstr "Exchange radnje"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr ""
+msgstr "U radu van mreže nije moguÄ?e pristupiti jeziÄ?ku â??PodeÅ¡avanja za Exchangeâ??."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
@@ -17621,12 +16185,8 @@ msgid "Cannot perform the operation."
 msgstr "Operacija se ne može odraditi."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Promene u podeÅ¡avanju Exchange naloga â??{0}â?? Ä?e nastupiti nakon izlaska i "
-"ponovnog pokretanja Evolucije."
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+msgstr "Promene u podeÅ¡avanju Exchange naloga â??{0}â?? Ä?e nastupiti nakon izlaska i ponovnog pokretanja Evolucije."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
@@ -17692,9 +16252,7 @@ msgstr "Nije moguÄ?e osvežiti stanje za van kancelarije"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
-"Potrebno je ponovo pokrenuti Evoluciju da bi se uÄ?italo sanduÄ?e prijavljenog "
-"korisnika"
+msgstr "Potrebno je ponovo pokrenuti Evoluciju da bi se uÄ?italo sanduÄ?e prijavljenog korisnika"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
@@ -17745,7 +16303,7 @@ msgid "Folder offline"
 msgstr "Fascikla nije na mreži"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Opšta greška"
 
@@ -17754,12 +16312,8 @@ msgid "Global Catalog Server is not reachable"
 msgstr "Server za opÅ¡ti katalog nije pristupaÄ?an."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Ukoliko OWA radi na drugoj putanji, morate je navesti u dijalogu za "
-"podešavanje naloga."
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgstr "Ukoliko OWA radi na drugoj putanji, morate je navesti u dijalogu za podešavanje naloga."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
@@ -17775,8 +16329,7 @@ msgstr "Proverite da li je ime servera ispravno napisano i pokušajte ponovo."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Proverite da li su korisniÄ?ko ime i lozinka ispravni i pokuÅ¡ajte ponovo."
+msgstr "Proverite da li su korisniÄ?ko ime i lozinka ispravni i pokuÅ¡ajte ponovo."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
@@ -17866,7 +16419,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Nepoznata greška u pronalaženju {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Nepoznata greška."
 
@@ -17880,14 +16435,11 @@ msgstr "Operacija nije podržana"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"Približavate se vašoj kvoti koju imate za smeštanje pošte na ovom serveru."
+msgstr "Približavate se vašoj kvoti koju imate za smeštanje pošte na ovom serveru."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "Dozvonjeno Vam je slanje poruke u ime samo jednog delegata odjednom."
+msgid "You are permitted to send a message on behalf of only one delegator at a time."
+msgstr "Dozvoljeno Vam je slanje poruke u ime samo jednog delegata odjednom."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
@@ -17902,28 +16454,16 @@ msgid "You may only configure a single Exchange account."
 msgstr "Možete samo da podesite jedan Exchange nalog."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"Trenutna iskoriÅ¡Ä?enost je: {0} KB. Probajte da oslobodite prostor brisanjem "
-"nekih poruka."
+msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgstr "Trenutna iskoriÅ¡Ä?enost je: {0} KB. Probajte da oslobodite prostor brisanjem nekih poruka."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"Trenutna iskoriÅ¡Ä?enost je: {0} KB. Od ovog trenutka neÄ?ete moÄ?i ni da Å¡aljete "
-"ni da primate poštu."
+msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgstr "Trenutna iskoriÅ¡Ä?enost je: {0} KB. Od ovog trenutka neÄ?ete moÄ?i ni da Å¡aljete ni da primate poÅ¡tu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"Trenutna iskoriÅ¡Ä?enost je: {0} KB. NeÄ?ete moÄ?i da Å¡aljete poÅ¡tu dok ne "
-"oslobodite prostor brisanjem nekih poruka."
+msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
+msgstr "Trenutna iskoriÅ¡Ä?enost je: {0} KB. NeÄ?ete moÄ?i da Å¡aljete poÅ¡tu dok ne oslobodite prostor brisanjem nekih poruka."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
@@ -17950,69 +16490,78 @@ msgid "Check folder permissions"
 msgstr "Proveri ovlaÅ¡Ä?enja fascikli"
 
 #: ../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"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "Automatski pokreni pri ureÄ?ivanju nove poruke"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Podrazumevani drugi ureÄ?ivaÄ?"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "Podrazumevana naredba koja se koristi kao ureÄ?ivaÄ?."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"Dodatak za koriÅ¡Ä?enje drugog ureÄ?ivaÄ?a za sastavljanje. Možete slati samo "
-"poruke u obiÄ?nom tekstu."
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "Drugi ureÄ?ivaÄ?"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#| msgid ""
+#| "A plugin for using an external editor as the composer. You can send only "
+#| "plain-text messages."
+msgid "Use an external editor to compose plain-text mail messages."
+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"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "UreÄ?ivaÄ? se ne pokreÄ?e"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-msgstr ""
-"Evolucija nije mogla da napravi privremenu datoteku za Ä?uvanje poÅ¡te. "
-"Pokušajte kasnije."
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgstr "Evolucija nije mogla da napravi privremenu datoteku za Ä?uvanje poÅ¡te. PokuÅ¡ajte kasnije."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"UreÄ?ivaÄ? koje ste naveli u postavkama dodatka nije moguÄ?e pokrenuti. "
-"PokuÅ¡ajte da navedete drugi ureÄ?ivaÄ?."
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#| msgid "External Editor"
+msgid "External editor still running"
+msgstr "Spoljni ureÄ?ivaÄ? je joÅ¡ aktivan"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "Sastavi u _drugom ureÄ?ivaÄ?u"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgstr "Pokrenut je spoljni ureÄ?ivaÄ?. Prozor sastavljaÄ?a poruke nije moguÄ?e zatvoriti dok je aktivan ureÄ?ivaÄ?."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "Sastavite poruke koriÅ¡Ä?enjem drugog ureÄ?ivaÄ?a"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr "UreÄ?ivaÄ? koje ste naveli u postavkama dodatka nije moguÄ?e pokrenuti. PokuÅ¡ajte da navedete drugi ureÄ?ivaÄ?."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "Naredba za izvrÅ¡avanje radi pokretanja ureÄ?ivaÄ?a:"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
+#| msgid ""
+#| "For Emacs use \"xemacs\"\n"
+#| "For VI use \"gvim\""
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Za Emaks koristite â??xemacsâ??\n"
-"Za VI koristite â??gvimâ??"
+"Za VI koristite â??gvim -fâ??"
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#| msgid "Compose in _External Editor"
+msgid "Compose in External Editor"
+msgstr "Sastavlja u spoljnom ureÄ?ivaÄ?u"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -18027,41 +16576,47 @@ msgid "_Face"
 msgstr "_Lice"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#| msgid ""
+#| "Attach Face header to outgoing messages. First time the user needs to "
+#| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#| "evolution/faces This will be used in messages that are sent further."
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages."
 msgstr ""
-"Prilaže zaglavlje s licem odlaznim porukama. Potrebno je prvi put da korisnik "
-"podesi 48*48 png sliku. Ona je šifrirana kao base64  i smeštena u ~/."
-"evolution/faces Kao takva Ä?e biti koriÅ¡Ä?ena u porukama koje se nadalje Å¡alju."
+"Prilaže sliÄ?icu VaÅ¡eg lica odlaznim porukama.\n"
+"\n"
+"Potrebno je prvi put da korisnik podesi PNG sliku 48*48. Ona je Å¡ifrovana kao bBase-64 i smeÅ¡tena u ~/.evolution/faces. Kao takva Ä?e biti koriÅ¡Ä?ena u porukama koje se nadalje Å¡alju."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Odjava sa fascikle â??%sâ??"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-#, fuzzy
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-"Dozvoljava odjavu fascikli za poštu u meniju desnim klikom na stablo fascikli."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Odjavi fascikle"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "Odjavite se sa fascikle IMAP desnim klikom na stablo fascikli."
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
+msgstr "Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -18070,47 +16625,41 @@ msgstr ""
 "Nije moguÄ?e proÄ?itati podatke sa servera Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "Kal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "Dovuci _listu"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "PrikljuÄ?ak za postavljanje kalendara i kontakata za google."
+msgid "Add Google Calendars to Evolution."
+msgstr "Dodaje Google kalendare u Evoluciju."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Izvori Google"
+#| msgid "Gnome Calendar"
+msgid "Google Calendars"
+msgstr "Google kalendari"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Spisak"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Dodatak za nameštanje izvora grupnih kalendara i imenika."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Dodaje podršku za Novell GroupWise u Evoluciju."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "Postavljanje GroupWise naloga"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -18124,41 +16673,41 @@ msgid ""
 "Click 'Forward' 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"
+"Poruka od â??%sâ??\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Kliknite 'Napred' radi instalacije deljene fascikle\n"
+"Kliknite â??Napredâ?? radi instalacije deljene fascikle\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Instaliraj deljenu fasciklu"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Instalacija deljene fascikle"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
-msgstr "PodeÅ¡avanja za Ä?ubre"
+msgstr "Postavke za Ä?ubre"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "PodeÅ¡avanja poÅ¡te za Ä?ubre"
+msgstr "Postavke poÅ¡te za Ä?ubre"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
-msgstr "PodeÅ¡avanja poÅ¡te za Ä?ubre..."
+msgstr "Postavke poÅ¡te za Ä?ubre..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
-msgstr "<b>Neželjene poruke:</b>"
+msgstr "<b>Spisak Ä?ubreta:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -18175,25 +16724,21 @@ msgstr "_OmoguÄ?i"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "Lista za Ä?u_bre"
+msgstr "Spisak Ä?_ubreta"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "PovlaÄ?enje poruke"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
-msgstr ""
-"PovlaÄ?enje poruke je može ukloniti iz sanduÄ?eta primaoca. Želite li ovo da "
-"uradite? "
+#: ../plugins/groupwise-features/mail-retract.c:57
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
+msgstr "PovlaÄ?enje poruke je može ukloniti iz sanduÄ?eta primaoca. Želite li ovo da uradite? "
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Poruka povuÄ?ena uspeÅ¡no"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Povuci poštu"
 
@@ -18202,94 +16747,121 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Dodaj opcije slanja GroupWise porukama"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Dodatak za moguÄ?nosti GroupWise naloga."
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "Fino podesite naloge GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise moguÄ?nosti"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "PovlaÄ?enje poruke nije uspelo"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "Server nije dozvolio povlaÄ?enje izabrane poruke."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Nalog imena &quot;{0}&quot; veÄ? postoji. Proverite stablo fascikli."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Nalog veÄ? postoji"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Neispravan korisnik"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "Prijava na posrednika kao &quot;{0}&quot; nije bila uspešna. Proverite adresu e-pošte i pokušajte ponovo."
+
 # 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-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Korisniku &quot;{0}&quot; ne može biti dodeljen pristup posredniku"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "Izaberite korisnika"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "VeÄ? imate ovlaÅ¡Ä?enja za posrednika za ovog korisnika."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Morate navesti ispravno korisniÄ?ko ime za davanje prava pristupa posredniku."
+msgstr "Morate navesti ispravno korisniÄ?ko ime za davanje prava pristupa posredniku."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.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."
+#: ../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;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "Nalog veÄ? postoji"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "Morate navesti ime korisnika kojeg želite da dodate na spisak"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Prijava na posrednika kao &quot;{0}&quot; nije bila uspešna. Proverite "
-"adresu e-pošte i pokušajte ponovo."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
+msgstr "Želite li ponovo da pošaljete sastanak ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Želite li ponovo da pošaljete sastanak koji se ponavlja ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#| msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgid "Do you want to retract the original item ?"
+msgstr "Želite li da povuÄ?ete originalnu stavku ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "Original Ä?e biti uklonjen iz poÅ¡tanskog sanduÄ?eta primaoca."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "Ovaj sastanak se ponavlja"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "Ovo Ä?e napraviti novi sastanak koriÅ¡Ä?enjem detalja postojeÄ?ih sastanaka. "
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgstr "Ovo Ä?e napraviti novi sastanak sa detaljima postojeÄ?ih sastanaka. Pravilo za ponavljanje morate uneti ponovo."
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "Prihvatate?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "Odbijate?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-#, fuzzy
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Ne možete podeliti fasciklu sa navedenim korisnikom &quot;{0}&quot;."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-#, fuzzy
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Morate navesti kime korisnika kojeg želite da dodate na listu"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Prihvati uz rezervu"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#| msgid "_Delegate Meeting..."
+msgid "Rese_nd Meeting..."
+msgstr "Ponovo _Å¡alji sastanak..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Korisnici:</b>"
@@ -18303,7 +16875,7 @@ msgid "Con_tacts..."
 msgstr "Kon_takti..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Poruka"
 
@@ -18349,7 +16921,7 @@ msgstr "Izmeni _fascikle/opcije/pravila/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr "Ä?itaj predmete oznaÄ?ene kao _liÄ?no"
+msgstr "Ä?itaj stavke oznaÄ?ene kao _liÄ?no"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
@@ -18388,10 +16960,10 @@ msgstr "<b>Ime naloga</b>"
 msgid "Proxy Login"
 msgstr "Prijava za mrežnog posrednika"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite lozinku za %s (korisnik %s)"
@@ -18399,122 +16971,119 @@ msgstr "%sUnesite lozinku za %s (korisnik %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "Prijava za mrežnog _posrednika..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"JeziÄ?ak za mrežnog posrednika Ä?e biti dostupan samo kada nalog bude na mreži."
+msgstr "JeziÄ?ak za mrežnog posrednika Ä?e biti dostupan samo kada nalog bude na mreži."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"JeziÄ?ak za mrežnog posrednika Ä?e biti dostupan samo kada nalog bude omoguÄ?en."
+msgstr "JeziÄ?ak za mrežnog posrednika Ä?e biti dostupan samo kada nalog bude omoguÄ?en."
 
 #: ../plugins/groupwise-features/send-options.c:214
-#, fuzzy
 msgid "Advanced send options"
-msgstr "Umetni napredne moguÄ?nosti slanja"
+msgstr "Napredne opcije slanja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Unesite korisnike i postavite ovlaÅ¡Ä?enja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "Nova _deljena fascikla..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Deljenje"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "PrilagoÄ?eno obaveÅ¡tenje"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Dodaj "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Izmeni"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Status poruke"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Naslov:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "Å alje:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Datum pravljenja:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Primalac:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "IsporuÄ?eno:"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Otvoreno:"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "PrihvaÄ?eno:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Obrisano:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Odbijeno:"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Završeno:"
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "NeisporuÄ?eno:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Prati status poruke..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Dodatak za nameštanje Hulinih izvora kalendara."
+msgid "Add Hula support to Evolution."
+msgstr "Dodaje podršku za Hula u Evoluciju."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Podešavanje Hula naloga"
+msgid "Hula Support"
+msgstr "Podrška za Hula"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "PrilagoÄ?ena zaglavlja"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP zaglavlja"
 
@@ -18531,20 +17100,14 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Osnovna i zaglavlja _Dopisnih lista (Podrazumevano)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Pribavi s_va zaglavlja"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim "
-"zaglavljima. \n"
-"Izborom \"Sva zaglavlja\" ovo možete ignorisati."
+"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim zaglavljima. \n"
+"Izborom â??Sva zaglavljaâ?? ovo možete ignorisati."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18552,7 +17115,7 @@ msgstr ""
 "Izaberite postavke IMAP zaglavlja. \n"
 "Å to viÅ¡e zaglavlja imate viÅ¡e Ä?e vremena biti potrebno za njihovo preuzimanje."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18560,71 +17123,34 @@ msgstr ""
 "_Osnovna zaglavlja - (Najbrže) \n"
 "Koristite ovo ukoliko nemate filtere na dopisnim listama"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#| msgid "Fetch A_ll Headers"
+msgid "_Fetch All Headers"
+msgstr "_Pribavi sva zaglavlja"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "Dodatak za moguÄ?nosti IMAP naloga."
+msgid "Fine-tune your IMAP accounts."
+msgstr "Fino podesite IMAP naloge."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP moguÄ?nosti"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "Izvez_i u kalendar"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "Uvezi u _zaduženja"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Uvezi Internet kalendar"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Izaberit_e spisak zaduženja"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Izaberite kalendar"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "U_voz"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Uvezi u kalendar"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "Uvozi ICS priloge u kalendar."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Sloj hardverske apstrakcije nije uÄ?itan"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"Servis \"hald\"  je neophodan ali nije trenutno aktivan. UkljuÄ?ite servis i "
-"ponovo pokrenite program, ili kontaktirajte administratora sistema."
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr "Servis â??haldâ??  je neophodan ali nije trenutno aktivan. UkljuÄ?ite servis i ponovo pokrenite program, ili kontaktirajte administratora sistema."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "Traženje iPod ureÄ?aja nije uspelo"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolucija nije pronaÅ¡la iPod radi usklaÄ?ivanja. UreÄ?aj ili nije prikljuÄ?en na "
-"sistem ili nije ukljuÄ?en."
+msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
+msgstr "Evolucija nije pronaÅ¡la iPod radi usklaÄ?ivanja. UreÄ?aj ili nije prikljuÄ?en na sistem ili nije ukljuÄ?en."
 
 #: ../plugins/ipod-sync/ical-format.c:119
 #: ../plugins/save-calendar/ical-format.c:164
@@ -18632,210 +17158,196 @@ msgid "iCalendar format (.ics)"
 msgstr "iKalendar oblik (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"UsklaÄ?uje izabrano zaduženje/beleÅ¡ku/kalendar/adresar sa džepnim ureÄ?ajem "
-"Apple iPod"
+msgid "Synchronize to iPod"
+msgstr "Uskladi sa iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "Uskladi sa iPod džepnim ureÄ?ajem"
+#| msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
+msgstr "UsklaÄ?uje podatke sa Apple iPod."
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "_UsklaÄ?ivanje sa iPod džepnim ureÄ?ajem"
+msgstr "_UsklaÄ?ivanje sa iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Nije moguÄ?e otvaranje kalendara â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
-"Jedan zakazani sastanak u kalendaru â??%sâ?? je u isto vreme kad i ovaj susret"
+msgstr "Jedno zakazivanje u kalendaru â??%sâ?? je u isto vreme kad i ovaj sastanak"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "Zakazani sastanak je pronaÄ?en u kalendaru â??%sâ??"
+msgstr "Zakazivanje je pronaÄ?eno u kalendaru â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
-msgstr "Ne mogu da pronaÄ?em nijedan kalendar"
+msgstr "Nije moguÄ?e pronaÄ?i nijedan kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
-msgstr "Ne mogu pronaÄ?i ovaj susret u nijednom kalendaru"
+msgstr "Nije moguÄ?e pronaÄ?i ovaj sastanak ni u jednom kalendaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
-msgstr "Ne mogu pronaÄ?i ovo zaduženje u nijednom spisku zaduženja"
+msgstr "Nije moguÄ?e pronaÄ?i ovaj zadatak ni u jednom spisku zadataka"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#| msgid "Opening calendar"
+msgid "Opening the calendar. Please wait.."
+msgstr "Otvaranje kalendara. SaÄ?ekajte..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
-msgstr "Pretraga jedne postojeÄ?e verzije ovog sastanka je u toku"
+msgstr "Pretraga jedne postojeÄ?e verzije ovog zakazivanja je u toku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
-msgstr "Nije moguÄ?a obrada predmeta"
+msgstr "Nije moguÄ?a obrada stavke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Nije moguÄ?e slanje predmeta kalendaru â??%sâ??.  %s"
+msgstr "Nije moguÄ?e slanje stavke kalendaru â??%sâ??.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr "Poslato kalendaru â??%sâ?? kao prihvaÄ?eno"
+msgstr "Poslato kalendaru â??%sâ?? kao prihvaÄ?eno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "Poslato kalendaru â??%sâ?? uz rezervu"
+msgstr "Poslato kalendaru â??%sâ?? uz rezervu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr "Poslato kalendaru â??%sâ?? kao odbijeno"
+msgstr "Poslato kalendaru â??%sâ?? kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru â??%sâ?? kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nije moguÄ?e poslati obaveÅ¡tenje o otkazivanju delegatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Stanje uÄ?esnika nije osveženo zbog neispravnog stanja"
+msgstr "Status uÄ?esnika nije ažurirano zbog neispravnog stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Nije moguÄ?e osvežavanje za uÄ?esnika. %s"
+msgstr "Nije moguÄ?e ažurirati uÄ?esnika. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
-msgstr "Stanje uÄ?esnika je osveženo"
+msgstr "Status uÄ?esnika je ažuriran"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
-msgstr "Podatak o zaduženju poslat"
+msgstr "Podatak o zadatku poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "Podatak o belešci poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nije moguÄ?e slanje podataka o sastanku, sastanak ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
-msgstr "Nije moguÄ?e slanje podatka o zaduženju, zaduženje ne postoji"
+msgstr "Nije moguÄ?e slanje podatka o zadatku, zaduženje ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nije moguÄ?e slanje podataka o beleÅ¡ci, beleÅ¡ka ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Poruka prijavljuje kalendar, ali taj kalendar nije ispravan iKalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
-msgstr "Predmet u kalendaru nije ispravan"
+msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
-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, zaduženja ili slobodno/"
-"zauzeto podatke."
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "Poruka sadrži kalendar, ali on ne sadrži dogaÄ?aje, zadatke ili slobodno/zauzeto podatke."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
-msgstr "Kalendar u prilogu sadrži više predmeta"
+msgstr "Kalendar u prilogu sadrži više stavki"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Radi obrade svih ovih predmeta, potrebno je datoteku saÄ?uvati a kalendar "
-"uvesti"
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+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:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "Ovaj se sastanak ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
-msgstr "Ovo se zaduženjese ponavlja"
+msgstr "Ovaj se zadatak se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "Ova se beleška ponavlja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Obriši poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Tabela pretrage za preklapanjima"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "Danas"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18854,11 +17366,6 @@ msgstr "Danas %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "Danas %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "Sutra"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19000,12 +17507,12 @@ msgstr "Primljeno u ime <b>%s</b>"
 #: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> preko %s objavi sledeÄ?i podatak o sastanku:"
+msgstr "<b>%s</b> preko %s objavljuje sledeÄ?i podatak o sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> objavi sledeÄ?i podatak o sastanku:"
+msgstr "<b>%s</b> objavljuje sledeÄ?i podatak o sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
@@ -19034,16 +17541,12 @@ msgstr "<b>%s</b> želi da doda postojeÄ?em sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> preko %s želi da primi najnovije informacije za sledeÄ?i sastanak:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> preko %s želi da primi najnovije informacije za sledeÄ?i sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> želi da primi najnoviji podatak za sledeÄ?i sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
@@ -19054,17 +17557,17 @@ msgstr "<b>%s</b> preko %s Å¡alje sledeÄ?i odgovor za sastanak:"
 #: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> posla sledeÄ?i odgovor za sastanak:"
+msgstr "<b>%s</b> Å¡alje sledeÄ?i odgovor za sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> preko %s otkaza sledeÄ?i sastanak:"
+msgstr "<b>%s</b> preko %s otkazuje sledeÄ?i sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> otkaza sledeÄ?i sastanak."
+msgstr "<b>%s</b> otkazuje sledeÄ?i sastanak."
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
@@ -19074,22 +17577,22 @@ msgstr "<b>%s</b> preko %s predlaže sledeÄ?e promene sastanka."
 #: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> predloži sledeÄ?e promene sastanka."
+msgstr "<b>%s</b> predlaže sledeÄ?e promene sastanka."
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> preko %s odbi sledeÄ?e promene sastanka:"
+msgstr "<b>%s</b> preko %s odbija sledeÄ?e promene sastanka:"
 
 #: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> odbi sledeÄ?e promene sastanka."
+msgstr "<b>%s</b> odbija sledeÄ?e promene sastanka."
 
 #: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> preko %s objavi sledeÄ?e zaduženje:"
+msgstr "<b>%s</b> preko %s objavljuje sledeÄ?i zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
@@ -19099,96 +17602,87 @@ msgstr "<b>%s</b> objavi sledeÄ?e zaduženje:"
 #: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> zahteva da %s preuzme sledeÄ?e zaduženje:"
+msgstr "<b>%s</b> zahteva da %s preuzme sledeÄ?i zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> preko %s Vam dodeli zaduženje:"
+msgstr "<b>%s</b> preko %s Vam dodeljuje zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> Vam dodeli zaduženje:"
+msgstr "<b>%s</b> Vam dodeljuje zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b preko %s želi da doda postojeÄ?em zaduženju:"
+msgstr "<b>%s</b> preko %s želi da doda postojeÄ?em zadatku:"
 
 #: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b želi da doda postojeÄ?em zaduženju:"
+msgstr "<b>%s</b želi da doda postojeÄ?em zadatku:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> preko %s želi da dobije najnovije informacije za sledeÄ?e dodeljeno "
-"zaduženje:"
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> preko %s želi da dobije najnovije informacije za sledeÄ?i dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> želi da dobije najnovije informacije za sledeÄ?e dodeljeno zaduženje:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> želi da dobije najnovije informacije za sledeÄ?i dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> preko %s vraÄ?a sledeÄ?i odgovor na dodeljeno zaduženje:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> preko %s vraÄ?a sledeÄ?i odgovor na dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> posla nazad sledeÄ?i odgovor na dodeljeno zaduženje:"
+msgstr "<b>%s</b> Å¡alje nazad sledeÄ?i odgovor na dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> preko %s otkaza sledeÄ?e dodeljeno zaduženje:"
+msgstr "<b>%s</b> preko %s otkazuje sledeÄ?i dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> otkaza sledeÄ?e dodeljeno zaduženje:"
+msgstr "<b>%s</b> otkazuje sledeÄ?i dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> preko %s predlaže sledeÄ?e promene u dodeli zaduženja:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> preko %s predlaže sledeÄ?e promene u dodeli zadatka:"
 
 #: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> predloži sledeÄ?e promene u dodeli zaduženja:"
+msgstr "<b>%s</b> predlaže sledeÄ?e promene u dodeli zadatka:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> preko %s odbi sledeÄ?e dodeljeno zaduženje:"
+msgstr "<b>%s</b> preko %s odbija sledeÄ?i dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> odbi sledeÄ?e dodeljeno zaduženje:"
+msgstr "<b>%s</b> odbija sledeÄ?i dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> preko %s objavi sledeÄ?u beleÅ¡ku:"
+msgstr "<b>%s</b> preko %s objavljuje sledeÄ?u beleÅ¡ku:"
 
 #: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> objavi sledeÄ?u beleÅ¡ku:"
+msgstr "<b>%s</b> objavljuje sledeÄ?u beleÅ¡ku:"
 
 #: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
@@ -19203,140 +17697,132 @@ msgstr "<b>%s</b> želi da doda postojeÄ?oj beleÅ¡ci:"
 #: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> preko %s otkaza sledeÄ?u deljenu beleÅ¡ku:"
+msgstr "<b>%s</b> preko %s otkazuje sledeÄ?u deljenu beleÅ¡ku:"
 
 #: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> otkaza sledeÄ?e deljenu beleÅ¡ku:"
+msgstr "<b>%s</b> otkazuje sledeÄ?e deljenu beleÅ¡ku:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Otvori kalendar"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_Odbij"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Odbij"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "Pri_hvati"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "P_rihvati sve"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "Pošalji podat_ke"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
-msgstr "Osveži stanje uÄ?esni_ka"
+msgstr "Ažuriraj stanje uÄ?esni_ka"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
-msgstr "Os_veži"
+msgstr "_Ažuriraj"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Vreme poÄ?etka:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Vreme završetka:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
-msgstr "Napomena:"
+msgstr "Komentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
-msgstr "PoÅ¡alji o_svežene podatke uÄ?esnicima"
+msgstr "PoÅ¡alji _ažurirane podatke uÄ?esnicima"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
-msgstr ""
+msgstr "_OÄ?uvaj moj podsetnik"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
-msgstr "Podsetnik na priloge"
-
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "Za_duženja:"
+msgstr "_Nasledi podsetnik"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "Beleške :"
+#| msgid "_Memos"
+msgid "_Memos:"
+msgstr "_Beleške:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "Prikazuje delove teksta/kalendara u porukama."
+#| msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Prikazuje MIME delove â??text/calendarâ?? u porukama."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
-msgstr "Itip oblikovanje"
+msgstr "Itip formatiranje"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; delegira sastanak. Želite li da dodate delegata &quot;{1}"
-"&quot; ?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
+msgstr "&quot;{0}&quot; delegira sastanak. Želite li da dodate delegata &quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Ovaj sastanak je delegiran"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan uÄ?esnik. Dodati ga u prisutne?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -19344,13 +17830,13 @@ msgid "Proxy _Logout"
 msgstr "_Odjava sa mrežnog posrednika"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Dozvoljava iskljuÄ?ivanje naloga."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "IskljuÄ?i nalog"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "OnemoguÄ?ava nalog desnim klikom na stablo fascikli."
+
 #: ../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."
@@ -19372,20 +17858,16 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Stvara D-BUS poruku kada stigne nova pošta."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"Svirne ako je postavljeno na â??trueâ?? (taÄ?no), a inaÄ?e puÅ¡ta zvuÄ?nu datoteku "
-"kada stigne nova poruka."
+msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgstr "Svirne ako je postavljeno na â??trueâ?? (taÄ?no), a inaÄ?e puÅ¡ta zvuÄ?nu datoteku kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
-msgstr "ObaveÅ¡tava samo za nove poruke u prijemnom sanduÄ?etu."
+msgstr "ObaveÅ¡tava samo za nove poruke u SanduÄ?etu."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
-msgstr "PuÅ¡ta zvuÄ?nu datoteku kada stigne nova poruka."
+msgstr "Pušta zvuk kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
@@ -19393,8 +17875,7 @@ msgstr "IskaÄ?uÄ?a poruka sa ikonom."
 
 #: ../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."
+msgstr "Prikazuje ikonu za novu poštu u obaveštajnoj zoni kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -19402,13 +17883,11 @@ msgstr "Ime datoteke za puštanje."
 
 #: ../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."
+msgstr "ZvuÄ?na datoteka za puÅ¡tanje kada stigne nova poruka, ukoliko nije ukljuÄ?eno obaveÅ¡tenje sirenom."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Da li da pusti zvuÄ?nu datoteku ili svirne kada stigne nova poruka."
+msgstr "Da li da pusti zvuk ili svirne kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
@@ -19420,22 +17899,22 @@ msgstr "Da li da ikona trepÄ?e ili ne."
 
 #: ../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 prijemno sanduÄ?e."
+msgstr "Da li da obavesti o novoj poruci samo za SanduÄ?e."
 
-#: ../plugins/mail-notification/mail-notification.c:260
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "Stvara _D-Bus poruku"
 
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolucijino obaveštenje o pošti"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
-msgstr "Postavke obaveštenja o pošti"
+msgstr "Podešavanja obaveštenja o pošti"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19453,7 +17932,7 @@ msgstr[2] ""
 "Primili ste %d novih poruka\n"
 "u %s."
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19461,110 +17940,206 @@ msgstr[0] "Primili ste %d novu poruku."
 msgstr[1] "Primili ste %d nove poruke."
 msgstr[2] "Primili ste %d novih poruka."
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "Prikazuje ikonu u _obaveštajnoj zoni"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "Tre_peri ikona u obaveštajnoj zoni "
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "Prikaži _poruku zajedno sa ikonom"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "_Pusti zvuk kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_Svirni"
 
-#: ../plugins/mail-notification/mail-notification.c:763
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Pusti _zvuÄ?nu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
-msgstr "Izaberite zvuÄ?nu datoteku"
+msgstr "Bira zvuÄ?nu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:776
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "Pu_sti"
 
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
-msgstr "Obavesti o novim porukama samo za _prijemno sanduÄ?e"
+msgstr "Obavesti o novim porukama samo za _SanduÄ?e"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr ""
-"Stvara D-Bus poruku ili obaveštava korisnika ikonom u obaveštajnoj zoni i "
-"obaveštenjem kada stigne nova poruka."
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Obaveštenje o pošti"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
-"Dodatak koji omoguÄ?ava pravljenje sastanaka iz sadržaja elektronske poruke."
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#| msgid "Play sound when new messages arrive."
+msgid "Notifies you when new mail messages arrive."
+msgstr "Obaveštava Vas kada stigne nova poruka."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
+msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgstr "Izabrani kalendar veÄ? sadrži dogaÄ?aj â??%sâ??. Želite li da uredite stari dogaÄ?aj?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgstr "Izabrani spisak veÄ? sadrži zadatak â??%sâ??. Želite li da uredite stari zadatak?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgstr "Izabrani spisak veÄ? sadrži beleÅ¡ku â??%sâ??. Želite li da uredite staru beleÅ¡ku?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
+msgstr "Izabrani kalendar veÄ? sadrži neke dogaÄ?aje za date poruke. Želite li ipak da napravite nove?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr "Izabrani spisak veÄ? sadrži neke zadatke za date poruke. Želite li ipak da napravite nove?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
+msgstr "Izabrani spisak veÄ? sadrži neke beleÅ¡ke za date poruke. Želite li ipak da napravite nove?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Prome_ni u sastanak"
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
+msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
+msgstr[0] "Izabrani kalendar veÄ? sadrži dogaÄ?aj za datu poruku. Želite li ipak da napravite novi?"
+msgstr[1] "Izabrani kalendar veÄ? sadrži dogaÄ?aje za date poruke. Želite li ipak da napravite nove?"
+msgstr[2] "Izabrani kalendar veÄ? sadrži dogaÄ?aja za date poruke. Želite li ipak da napravite nove?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Pošalji poruku za sastanak"
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
+msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
+msgstr[0] "Izabrani spisak veÄ? sadrži zadatak za datu poruku. Želite li ipak da napravite novi?"
+msgstr[1] "Izabrani spisak veÄ? sadrži zadatke za date poruke. Želite li ipak da napravite nove?"
+msgstr[2] "Izabrani spisak veÄ? sadrži zadataka za date poruke. Želite li ipak da napravite nove?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:295
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
+msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
+msgstr[0] "Izabrani spisak veÄ? sadrži beleÅ¡ku za datu poruku. Želite li ipak da napravite novu?"
+msgstr[1] "Izabrani spisak veÄ? sadrži beleÅ¡ke za date poruke. Želite li ipak da napravite nove?"
+msgstr[2] "Izabrani spisak veÄ? sadrži beleÅ¡ki za date poruke. Želite li ipak da napravite nove?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+#| msgid "No Summary"
+msgid "[No Summary]"
+msgstr "[Bez sažetka]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "Neispravan objekat vraÄ?en od servera"
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+#| msgid "An error occurred while printing"
+msgid "An error occurred during processing: %s"
+msgstr "Javila se greška u obradi: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Nije moguÄ?e otvoriti kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:300
-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 zaduženje. "
-"Izaberite drugi izvor."
+#: ../plugins/mail-to-task/mail-to-task.c:606
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+msgstr "Izabrani izvor je samo za Ä?itanje, stoga ne možete tu napraviti dogaÄ?aj. Izaberite drugi izvor."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr "Izabrani izvor je samo za Ä?itanje, stoga ne možete tu napraviti zadatak. Izaberite drugi izvor."
+
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+msgstr "Izabrani izvor je samo za Ä?itanje, stoga ne možete tu napraviti beleÅ¡ku. Izaberite drugi izvor."
+
+# mail:no-copy-folder-nostore secondary
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot get source list. %s"
+msgstr "Nije moguÄ?e dobiti spisak izvora. %s"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr ""
-"Dodatak koji omoguÄ?ava pravljenje zaduženja iz sadržaja elektronske poruke."
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+msgstr "Pretvara poruku u zadatak."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Pro_meni u zaduženje"
+#| msgid "Create a new memo"
+msgid "Create a Mem_o"
+msgstr "Napravi belešk_u"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "Pošta za zaduženje"
-
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Pretvori izabranu poruku u novo zaduženje"
+#| msgid "New _Meeting"
+msgid "Create a _Meeting"
+msgstr "Napravi _sastanak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#| msgid "Create a new task"
+msgid "Create a _Task"
+msgstr "Napravi _zadatak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#| msgid "_Create new view"
+msgid "Create an _Event"
+msgstr "Napravi _dogaÄ?aj"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+#| msgid "Mail to task"
+msgid "Mail-to-Task"
+msgstr "Pošta-u-zadatak"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "Napravi novi dogaÄ?aj od izabrane poruke"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting from the selected message"
+msgstr "Napravi novi sastanak od izabrane poruke"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "Napravi novu belešku od izabrane poruke"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "Napravi novi zadatak od izabrane poruke"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19588,10 +18163,11 @@ msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
-"ObezbeÄ?uje radnje za opÅ¡te naredbe dopisnih listi (prijava, odjava, ...)."
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Izvodi uobiÄ?ajene radnje za dopisnu listu (prijava, odjava, itd.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19611,14 +18187,11 @@ msgstr "Radnja nije dostupna"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"Elektronska poruka Ä?e biti poslata na adresu â??{0}â??. Možete poruku da "
-"pošaljete automatski, ili je prvo pogledati i izmeniti.\n"
+"Elektronska poruka Ä?e biti poslata na adresu â??{0}â??. Možete poruku da poÅ¡aljete automatski, ili je prvo pogledati i izmeniti.\n"
 "\n"
 "Trebalo bi da dobijete odgovor sa dopisne liste ubrzo nakon slanja poruke."
 
@@ -19635,27 +18208,20 @@ msgid "Posting not allowed"
 msgstr "Slanje nije dozvoljeno"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"Slanje na ovu dopisnu listu nije dozvoljeno. Možda je ova lista samo za "
-"Ä?itanje. Obratite se vlasniku liste za detalje."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "Slanje na ovu dopisnu listu nije dozvoljeno. Možda je ova lista samo za Ä?itanje. Obratite se vlasniku liste za detalje."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Poslati elektronsku poruku na dopisnu listu?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-#, fuzzy
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Radnju nije moguÄ?e izvesti. To znaÄ?i da zaglavlje za ovu radnju nije sadržalo "
-"obradivu radnju.\n"
+"Radnju nije moguÄ?e izvesti. Zaglavlje za ovu radnju nije sadržalo obradivu radnju.\n"
 "\n"
 "Zaglavlje: {0}"
 
@@ -19670,9 +18236,7 @@ msgstr ""
 "Zaglavlje: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+msgid "This message does not contain the header information required for this action."
 msgstr "Ova poruka ne sadrži potrebne podatke u zaglavlju za ovu radnju."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -19736,21 +18300,19 @@ msgid "Also mark messages in subfolders?"
 msgstr "OznaÄ?iti takoÄ?e i poruke u podfasciklama?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:41
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Želite li da oznaÄ?ite poruke kao proÄ?itane samo u trenutnoj fascikli, ili i "
-"one u podfasciklama? "
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "Želite li da oznaÄ?ite poruke kao proÄ?itane samo u trenutnoj fascikli, ili i one u podfasciklama? "
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "Trenutna fascikla i _podfascikle"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#| msgid "Current Folder and _Subfolders"
+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:176
-msgid "Current _Folder Only"
-msgstr "Samo trenutna _fascikla"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#| msgid "Current _Folder Only"
+msgid "In Current _Folder Only"
+msgstr "Samo u trenutnoj _fascikli"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19761,20 +18323,22 @@ msgid "Mark Me_ssages as Read"
 msgstr "OznaÄ?i po_ruke kao proÄ?itane"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "Koristi se za obeležavanje svih poruka u fascikli da budu proÄ?itane"
+#| msgid "Mark all messages in the folder as read"
+msgid "Mark all messages in a folder as read."
+msgstr "OznaÄ?ava sve poruke u fascikli kao proÄ?itane."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Dodatak koji uvodi mono dodatke."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono pokretaÄ?"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "Dodaci za podršku pisani jezikom Mono."
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Dodatak za ukljuÄ?ivanje i iskljuÄ?ivanje drugih dodataka."
+#| msgid "Change Evolution's settings"
+msgid "Manage your Evolution plugins."
+msgstr "Upravlja dodacima Evolucije."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19788,7 +18352,7 @@ msgstr "UkljuÄ?uje i iskljuÄ?uje dodatke"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
-msgstr "Do_daci"
+msgstr "_PrikljuÄ?ci"
 
 #: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
@@ -19809,28 +18373,21 @@ msgstr "Pregled"
 #: ../plugins/plugin-manager/plugin-manager.c:362
 #: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
-msgstr "Dodatak"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"Probni dodatak koji pokazuje kako dodatak za oblikovanje omoguÄ?ava "
-"iskljuÄ?ivanje HTML poÅ¡te.\n"
-"\n"
-"Ovaj dodatak je samo za potrebe demonstracije.\n"
+msgstr "PrikljuÄ?ak"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Model teksta"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
-msgstr "Prednost tekst"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#| msgid "Prefer plain-text"
+msgid "Prefer Plain Text"
+msgstr "Prednost daje tekstu"
+
+#: ../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 "Pregleda poruke kao obiÄ?an tekst, Ä?ak i ako sadrže HTML."
 
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
@@ -19853,67 +18410,94 @@ msgid "Evolution Profiler"
 msgstr "Evolucijin ispitivaÄ?"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Upisuje dnevnik ispitivaÄ?kih dogaÄ?aja."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "DogaÄ?aji profila podataka u Evoluciji (samo za programere)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-#, fuzzy
 msgid "Import Outlook messages from PST file"
-msgstr "Uvozi poštu iz programa Pine."
+msgstr "Uvozi Outlook poruke iz datoteke PST"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-#, fuzzy
 msgid "Outlook PST import"
-msgstr "Outlook CSV i Tab uvoznik"
+msgstr "Outlook PST uvoz"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Outlook personal folders (.pst)"
-msgstr ""
+msgstr "LiÄ?ne fascikle Outlook (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
-msgstr "Imenik"
+msgstr "_Adresar"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
-msgstr "Zakazani sastanci"
+msgstr "Za_kazano"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:334
 #| msgid "Journal information"
 msgid "_Journal entries"
-msgstr "Podatak o dnevniku"
+msgstr "Unosi u _dnevnik"
 
-#: ../plugins/pst-import/pst-importer.c:352
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
-msgstr "Uvoženje Elm podataka"
+msgstr "Uvoženje Outlook podataka"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Dozvoljava objavljivanje kalendara na Internetu"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Objavljivanje kalendara"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Mesta"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#| msgid "Allows calendars to be published to the web"
+msgid "Publish calendars to the web."
+msgstr "Objavljuje kalendare na veb."
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
-#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open %s:"
+msgstr "Nije moguÄ?e otvaranje %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+#| msgid "Could not parse PGP message: Unknown error"
+msgid "Could not open %s: Unknown error"
+msgstr "Nije moguÄ?e otvoriti %s: nepoznata greÅ¡ka"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Javila se greška prilikom objave na %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "Objavljivanje na %s uspešno završeno"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Neuspelo montiranje %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
-msgstr "Sigurno želite da uklonite ovu adresu?"
+msgstr "Sigurno želite da uklonite ovu lokaciju?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#| msgid "Could not create message."
+msgid "Could not create publish thread."
+msgstr "Nije moguÄ?e objaviti raspravu."
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19950,7 +18534,6 @@ msgid "Publishing _Frequency:"
 msgstr "UÄ?esta_lost objavljivanja"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-#, fuzzy
 msgid ""
 "Secure FTP (SSH)\n"
 "Public FTP\n"
@@ -19960,39 +18543,54 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"Sigurni FTP (SSH)\n"
 "Javni FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
+"FTP (sa prijavom)\n"
+"Windows deljenje\n"
 "WebDAV (HTTP)\n"
 "Sigurni WebDAV (HTTPS)\n"
-"Proizvoljno mesto"
+"Proizvoljna lokacija"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "_Vrsta usluge:"
+msgstr "_Vrsta servisa:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#| msgid "Time _zone:"
+msgid "Time _duration:"
+msgstr "Vreme _trajanja:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "Dato_teka:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "O_bjavi kao:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Zapamti lozinku"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_KorisniÄ?ko ime:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"dani\n"
+"nedelje\n"
+"meseci"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -20000,13 +18598,19 @@ msgstr ""
 "iKal\n"
 "Slobodno/zauzeto"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "Nije moguÄ?e objaviti kalendar: pozadinski proces viÅ¡e ne postoji"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
-msgstr "Novo mesto"
+msgstr "Nova lokacija"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
-msgstr "Uredi mesto"
+msgstr "Uredi lokaciju"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -20025,186 +18629,149 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "PokretaÄ? test prikljuÄ?ka za Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin which loads other plugins written using Python."
-msgstr "PrikljuÄ?ak koji uÄ?itava druge prikljuÄ?ke pisanih jezikom python."
+msgstr "PrikljuÄ?ak koji uÄ?itava druge prikljuÄ?ke pisanih jezikom Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "PokretaÄ? Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "Spam ubica (ugraÄ?en)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Ubica spama nije pronaÄ?en, kod: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Nije uspelo pravljenje cevi: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Greška po izdvajanju: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "Zavisan proces SpamAssassin nije odgovorio, ubijam..."
+msgstr "Zavisan proces Ubici spama nije odgovorio, ubijam..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
-#, fuzzy, c-format
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "Ä?ekanje na zavistan proces Spamassassin ometeno, prekidam..."
+msgstr "Ä?ekanje na zavisan proces Ubice spama ometeno, prekidam..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Cev ka Spamassassin je pukla, oznaka greške: %d"
+msgstr "Cev ka Ubici spama je pukla, oznaka greške: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "Ubica spama nije dostupan."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Ovo Ä?e uÄ?initi Ubicu spama pouzdanijim, ali sporijim"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "U_kljuÄ?i mrežne provere"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Filtrira neželjenu poÅ¡tu koristeÄ?i Ubicu spama. Ovaj dodatak zahteva njegovu "
-"ponovnu instalaciju."
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Filtrira neželjenu poÅ¡tu koriÅ¡Ä?enjem Ubice spama."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
-msgid "SpamAssassin Options"
-msgstr "Opcije Ubica spama"
+#| msgid "SpamAssassin junk plugin"
+msgid "SpamAssassin Junk Filter"
+msgstr "Filter neželjene pošte Ubica spama"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "Dodatak za neželjenu poštu Ubice spama"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Dodatak za Ä?uvanje svih priloga ili delova poruke odjednom."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "SaÄ?uvaj priloge"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "SaÄ?uvaj priloge..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "SaÄ?uvaj sve priloge"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Izaberi ime za snimanje baze"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME tip"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "SaÄ?uvaj"
+msgid "SpamAssassin Options"
+msgstr "Opcije Ubice spama"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "JIB"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
-msgstr "Lista opisa"
+msgstr "Spisak opisa"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
-msgstr "Lista kategorija"
+msgstr "Spisak kategorija"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
-msgstr "Lista komentara"
-
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Napravljeno"
+msgstr "Spisak komentara"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Kontakt lista"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "PoÄ?etak"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Kraj"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "postotak završenog"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "Adresa"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Spisak uÄ?esnika"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Izmenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "Napredne opcije za CSV oblik"
+#: ../plugins/save-calendar/csv-format.c:523
+#| msgid "Advanced options for the CSV format"
+msgid "A_dvanced options for the CSV format"
+msgstr "Na_predne opcije za format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "Prvo ukljuÄ?i zaglavlje"
+#: ../plugins/save-calendar/csv-format.c:530
+#| msgid "Prepend a header"
+msgid "Prepend a _header"
+msgstr "Prvo ukljuÄ?i _zaglavlje"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "GraniÄ?nik vrednosti:"
+#: ../plugins/save-calendar/csv-format.c:539
+#| msgid "Value delimiter:"
+msgid "_Value delimiter:"
+msgstr "GraniÄ?nik _vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "GraniÄ?nik zapisa:"
+#: ../plugins/save-calendar/csv-format.c:546
+#| msgid "Record delimiter:"
+msgid "_Record delimiter:"
+msgstr "GraniÄ?nik _zapisa:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "Obavij vrednosti sa:"
+#: ../plugins/save-calendar/csv-format.c:553
+#| msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
+msgstr "_Obavij vrednosti sa:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Zarezom odvojen oblik vrednosti (.csv)"
 
@@ -20213,8 +18780,9 @@ msgid "Save Selected"
 msgstr "Izabrano Ä?uvanje"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "Ä?uva izabrani kalendar ili listu zaduženja na disk."
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
+msgstr "Ä?uva kalendar ili spisak zadataka na disk."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -20229,21 +18797,28 @@ msgstr "SaÄ?uvaj na _disk"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF oblik (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+#| msgid "Format"
+msgid "_Format:"
+msgstr "_Format:"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Izaberite izvor"
+#| msgid "Selects a single calendar or task source for viewing."
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Brzo bira jedan kalendar ili spisak zadataka za pregled."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Bira jedan izvor kalendara ili zaduženja za pregled."
+#| msgid "Select one source"
+msgid "Select One Source"
+msgstr "Izaberite jedan izvor"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20251,11 +18826,11 @@ msgstr "_Prikaži samo ovaj kalendar"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "Prikaži _samo ovaj spisak zaduženja"
+msgstr "Prikaži _samo ovaj spisak zadataka"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "_Prikaži samo ovaj spisak zaduženja"
+msgstr "_Prikaži samo ovaj spisak zadataka"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -20265,56 +18840,54 @@ msgstr "Vodi Vas kroz prvo podešavanje naloga."
 msgid "Setup Assistant"
 msgstr "PomoÄ?nik podeÅ¡avanja"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
-msgstr "PomoÄ?nik Evolucija podeÅ¡avanja"
+msgstr "PomoÄ?nik podeÅ¡avanja Evolucije"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Dobro došli"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"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"
+"Dobro doÅ¡li u Evoluciju. Nekoliko narednih ekrana Ä?e omoguÄ?iti da se Evolucija poveže na naloge eletronske poÅ¡te i da uveze datoteke iz drugih programa. \n"
 "\n"
 "Kliknite â??Napredâ?? da nastavite. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "Uvoženje datoteka"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "Uvoženje podataka."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "SaÄ?ekajte"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Obaveštava ako nizanje poruka treba da se vrati na naslov."
+#| msgid "Thread messages by subject"
+msgid "Sort mail message threads by subject."
+msgstr "Razvrstava poruke u raspravi prema naslovu."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20330,59 +18903,93 @@ msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-"Spisak parova kljuÄ?na-reÄ?/vrednost koje prikljuÄ?ak Å¡ablona predmeta zamenjuje u "
-"telu poruke."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgstr "Spisak parova kljuÄ?na-reÄ?/vrednost koje prikljuÄ?ak Å ablona predmeta zamenjuje u telu poruke."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "SaÄ?uvaj kao _Å¡ablon"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "Ä?uva kao Å¡ablon"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr "PrikljuÄ?ak za obrazac za pripreme"
+msgstr "PrikljuÄ?ak za obrazac nacrta"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-#, fuzzy
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Jednostavan dodatak koji koristi ytnef za dekodiranje tnef priloga."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Dekodira priloge TNEF (winmail.dat) iz programa Microsoft Outlook."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "Dekoder TNEF priloga"
+#| msgid "TNEF Attachment decoder"
+msgid "TNEF Decoder"
+msgstr "Dekoder TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#| msgid "Multiple vCards"
+msgid "Inline vCards"
+msgstr "Ugnježdene vKarte"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Prikazuje vKarte neposredno u porukama."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "Prikaži punu vKartu"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "Prikaži sažetu vKartu"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is one other contact."
+msgstr "Postoji još jedan kontakt."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Postoji još %d kontakt."
+msgstr[1] "Postoji još %d kontakta."
+msgstr[2] "Postoji još %d kontakta."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#| msgid "Save in address book"
+msgid "Save in Address Book"
+msgstr "SaÄ?uvaj u adresar"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "PrikljuÄ?ak za postavljanje WebDAV kontakata."
+#| msgid "WebDAV contacts"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Dodaje WebDAV kontakte u Evoluciju."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV kontakti"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "Adresa :"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
-#, fuzzy
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Izbegavaj IfMatch (potrebno na apaÄ?u < 2.2.8)"
+msgstr "_Izbegavaj IfMatch (potrebno na ApaÄ?u < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -20429,15 +19036,12 @@ msgid "Default window width"
 msgstr "Podrazumevana Å¡irina prozora"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"UkljuÄ?uje podeÅ¡avanja posrednika kada pristupa HTTP/bezbedan HTTP preko "
-"interneta."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "OmoguÄ?uje postavke posrednika kada pristupa HTTP/siguran HTTP preko Interneta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
-msgstr "DomaÄ?in posrednika za HTTP"
+msgstr "DomaÄ?in posrednika za HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
@@ -20456,219 +19060,185 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Ako je taÄ?no, povezivanje na posrednika zahteva autentifikaciju. KorisniÄ?ko "
-"ime se Ä?ita iz kljuÄ?a GConf â??/apps/evolution/shell/network_config/"
-"authentication_userâ??, a lozinka ili iz gnome-keyring, ili datoteke lozinki "
-"~/.gnome2_private/Evolution."
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr "Ako je taÄ?no, povezivanje na posrednika zahteva autentifikaciju. KorisniÄ?ko ime se Ä?ita iz kljuÄ?a GConf â??/apps/evolution/shell/network_config/authentication_userâ??, a lozinka ili iz gnome-keyring, ili datoteke lozinki ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "Last upgraded configuration version"
-msgstr "Poslednja nadograÄ?ena verzija podeÅ¡avanja"
+#| msgid "Insert Attachment"
+msgid "Initial attachment view"
+msgstr "Polazni pregled priloga"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Lista putanja fascikli za usklaÄ?ivanje na disku za rad van mreže"
+#| msgid "Install the shared folder"
+msgid "Initial file chooser folder"
+msgstr "Polazna fascikla izbiraÄ?a datoteka"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Polazna fascikla za prozorÄ?ad GtkFileChooser."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgstr "Polazni pregled za alatke trake priloga. â??0â?? je Pregled sa ikonama, â??1â?? je Pregled u spiskovima."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Last upgraded configuration version"
+msgstr "Poslednja nadograÄ?ena verzija podeÅ¡avanja"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Spisak putanja fascikli za usklaÄ?ivanje na disku za rad van mreže"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "DomaÄ?ini bez posrednika"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Lozinka za autentifikaciju prilikom koriÅ¡Ä?enja posrednika za HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "Model podešavanja posrednika"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "DomaÄ?in posrednika za SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "Port posrednika za SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "DomaÄ?in posrednika za HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
-msgstr "Port bezbednog posrednika za HTTP"
+msgstr "Port sigurnog posrednika za HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Izaberite naÄ?in podeÅ¡avanja posrednika. Podržane su vrednosti 0 (koristi "
-"sistemske postavke), 1 (bez posrednika), 2 (koristi ruÄ?na podeÅ¡avanja "
-"posrednika) i 3 (koristi podešavanja posrednika na adresi)."
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr "Izaberite naÄ?in podeÅ¡avanja posrednika. Podržane su vrednosti 0 â??koristi sistemske postavkeâ??, 1 â??bez posrednikaâ??, 2 â??koristi ruÄ?na podeÅ¡avanja posrednikaâ?? i 3 â??koristi podeÅ¡avanja posrednika na adresiâ??."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
-msgstr "BoÄ?na oblast je vidljiva"
+msgstr "BoÄ?na traka je vidljiva"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "PreskoÄ?i prozorÄ?e sa upozorenjem o razvoju"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "PoÄ?ni rad van mreže"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
-msgstr "Linija sa stanjem je vidljiva"
+msgstr "Traka statusa je vidljiva"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"Verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/nivoom podeÅ¡avanja â?? npr. "
-"â??2.6.0â??."
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/nivoom podeÅ¡avanja (na primer â??2.6.0â??)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "Podrazumevana visina prozora za poruku, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "Podrazumevana Å¡irina glavnog prozora, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
-msgstr "Podrazumevana Å¡irina pomoÄ?ne linije, u pikselima."
+msgstr "Podrazumevana Å¡irina boÄ?ne trake, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"Poslednja nadograÄ?ena verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/"
-"nivoom podeÅ¡avanja (npr. â??2.6.0â??)."
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Poslednja nadograÄ?ena verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/nivoom podeÅ¡avanja (na primer â??2.6.0â??)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "Naziv mašine za puštanje kroz HTTP posrednika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Naziv mašine za puštanje kroz bezbednog HTTP posrednika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "Naziv mašine za puštanje socks posrednika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/http_hostâ??â?? "
-"koji posrednik pušta."
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgstr "Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/http_hostâ?? koji posrednik puÅ¡ta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/secure_hostâ?? "
-"koji posrednik pušta."
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr "Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/secure_hostâ?? koji posrednik puÅ¡ta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/socks_hostâ?? "
-"koji posrednik pušta."
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr "Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/socks_hostâ?? koji posrednik puÅ¡ta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"Stil dugmadi prozora. Može biti â??textâ?? (tekst), â??iconsâ?? (ikonice), "
-"â??bothâ?? (oboje), â??toolbarâ?? (paleta alata). Ako je postavljeno â??toolbarâ??, "
-"Gnomovo podeÅ¡avanje palete alata utvrÄ?uje stil dugmadi."
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "Stil dugmadi prozora. Može biti â??textâ?? (tekst), â??iconsâ?? (ikone), â??bothâ?? (oboje), â??toolbarâ?? (traka alata). Ako je postavljeno â??toolbarâ??, Gnomovo podeÅ¡avanje trake alata utvrÄ?uje stil."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"Ovaj kljuÄ? sadrži spisak domaÄ?ina koji su direktno povezani, bez koriÅ¡Ä?enja "
-"posrednika (ukoliko je aktivan). Vrednosti mogu biti domaÄ?ini, domeni "
-"(upotrebom džokera poput *.foo.com), IP adrese domaÄ?ina (IPv4 i IPv6) i "
-"mrežne adrese sa maskom (nešto kao 192.168.0.0/24)."
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr "Ovaj kljuÄ? sadrži spisak domaÄ?ina koji su direktno povezani, bez koriÅ¡Ä?enja posrednika (ukoliko je aktivan). Vrednosti mogu biti domaÄ?ini, domeni (upotrebom džokera poput *.foo.com), IP adrese domaÄ?ina (IPv4 i IPv6) i mrežne adrese sa maskom (neÅ¡to kao 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
-msgstr "Paleta alata je vidljiva"
+msgstr "Traka alata je vidljiva"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "Adresa sa vrednostima za podešavanje posrednika."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "Koristi posrednika za HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "KorisniÄ?ko ime za autentifikaciju kada se koristi posrednik za HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Da li Ä?e se Evolucija pokrenuti u režimu za rad van mreže."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Da li da prozor bude uveÄ?an do kraja."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
-msgstr "Da li da boÄ?na povrÅ¡ bude vidljiva."
+msgstr "Da li da boÄ?na traka bude vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
-msgstr "Da li da statusna linija bude vidljiva."
+msgstr "Da li da traka statusa bude vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
-msgstr "Da li da paleta alata bude vidljiva."
+msgstr "Da li da traka alata bude vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Da li Ä?e prozorÄ?e sa upozorenjem u razvojnim verzijama Evolucije biti "
-"prikazano."
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Da li Ä?e prozorÄ?e sa upozorenjem u razvojnim verzijama Evolucije biti prikazano."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Da li da dugmad prozora budu vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Stil dugmadi prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
@@ -20684,23 +19254,19 @@ msgstr "Uspostavljene veze"
 msgid "Click OK to close these connections and go offline"
 msgstr "Kliknite U redu da prekinete vezu i radite van mreže"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite tip uvoznika:"
 
-#: ../shell/e-shell-importer.c:134
-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."
+#: ../shell/e-shell-importer.c:131
+msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+msgstr "Izaberite datoteku koju želite da uvezete u Evoluciju i izaberite kojeg je tipa ta datoteka iz liste."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Izaberite odredište za ovaj uvoz"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20712,58 +19278,64 @@ msgstr ""
 "koja bi se mogla uvesti. Ukoliko želite da pokušate\n"
 "ponovo, kliknite na dugme â??Nazadâ??.\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "_Tip datoteke:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "U_voz"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
-msgstr "Evolucijine postavke"
+msgstr "Podešavanja Evolucije"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47
+#: ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolucija"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izgleda da ovaj sistem nema instalirane Gnom pilot alate."
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "Greška pri pokretanju %s."
+#| msgid "Error executing %s."
+msgid "Error executing %s. (%s)"
+msgstr "Greška pri izvršavanju %s. (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bubaždajin pomoÄ?nik nije instaliran."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "Bubaždajin pomoÄ?nik ne može biti pokrenut."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "Igor NestoroviÄ? <igor prevod org>\n"
@@ -20771,23 +19343,24 @@ msgstr ""
 "\n"
 "http://prevod.org â?? prevod na srpski jezik."
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176
+#: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ra_d van mreže"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Rad van mreže"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20795,11 +19368,11 @@ msgstr ""
 "Evolucija je trenutno na mreži.\n"
 "Kliknite na ovo dugme za rad van mreže."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolucija je u procesu iskljuÄ?ivanja sa mreže."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20807,54 +19380,56 @@ msgstr ""
 "Evolucija trenutno nije na mreži.\n"
 "Kliknite na ovo dugme da se povežete."
 
-#: ../shell/e-shell-window.c:785
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "PreÄ?i na %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Nepoznata sistemska greška."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832
+#: ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251
+#: ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "U redu"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "Nije moguÄ?a registracija na OAF"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "Baza sa podeÅ¡avanjima nije naÄ?ena"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Nova proba"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "_Proba"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
-msgstr "Napravi novi probni predmet"
+msgstr "Napravi novu probnu stavku"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -20870,16 +19445,15 @@ msgstr "Uvezi datoteku"
 
 #: ../shell/import.glade.h:4
 msgid "Import Location"
-msgstr "Uvezi mesto"
+msgstr "Uvezi lokaciju"
 
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "Tip uvoznika"
 
 #: ../shell/import.glade.h:6
-#, fuzzy
 msgid "Select Information to Import"
-msgstr "Izaberite fasciklu za uvoz"
+msgstr "Izaberite informaciju za uvoz"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20896,7 +19470,7 @@ msgstr ""
 "uvoza spoljnih datoteka u Evoluciju."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20916,7 +19490,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Zdravo. Hvala što ste uložili vreme da preuzmete ovo razvojno izdanje\n"
-"Evolucija paketa programa.\n"
+"paketa programa Evolucija.\n"
 "\n"
 "Ova verzija Evolucije još nije potpuna. Sve je bliža,\n"
 "ali neke moguÄ?nosti ili nisu zavrÅ¡ene ili ne rade ispravno.\n"
@@ -20925,13 +19499,13 @@ msgstr ""
 "i instalirajte verziju %s.\n"
 "\n"
 "Ukoliko pronaÄ?ete greÅ¡ke, prijavite nam ih na bugzilla.gnome.org.\n"
-"Ovaj proizvod dolazi bez jamstva i nije namenjen pojedincima koji\n"
+"Ovaj proizvod dolazi bez jemstva i nije namenjen pojedincima koji\n"
 "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"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20939,43 +19513,43 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reÄ?i"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "PoÄ?ni rad na mreži"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Silom gasi sve delove Evolucije"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovan prenos podataka iz Evolucije 1.4"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 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:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
-msgstr "IskljuÄ?uje uÄ?itavanje svih dodataka."
+msgstr "OnemoguÄ?ava uÄ?itavanje svih dodataka."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "IskljuÄ?uje okno za pregled poÅ¡te, kontakata i zaduženja."
+msgstr "OnemoguÄ?ava okno za pregled poÅ¡te, kontakata i zadataka."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
-msgstr "Evolucija - LiÄ?ni urednik podataka i program za e-poÅ¡tu"
+msgstr "- Evolucija rukovodilac liÄ?nim podatacima i klijent e-poÅ¡te"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20990,9 +19564,8 @@ msgstr "Sigurno želite da sve zapamÄ?ene lozinke budu zaboravljene?"
 
 # shell:noshell-reason title
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
 msgid "Cannot start Evolution"
-msgstr "Ponovo pokreÄ?e Evoluciju"
+msgstr "Nije moguÄ?e pokrenuti Evoluciju"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Continue"
@@ -21009,16 +19582,12 @@ msgid "Evolution can not start."
 msgstr "Evolucija se ne može pokrenuti."
 
 #: ../shell/shell.error.xml.h:6
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Zaboravljanje lozinki Ä?e oÄ?istiti sve zapamÄ?ene lozinke. Ponovo Ä?ete biti "
-"upitani kada sledeÄ?i put budu bile potrebne."
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "Zaboravljanje lozinki Ä?e oÄ?istiti sve zapamÄ?ene lozinke. Ponovo Ä?ete biti upitani kada sledeÄ?i put budu bile potrebne."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
-msgstr "Nedovoljno mesta na disku za dograÄ?ivanje."
+msgstr "Nedovoljno mesta na disku za nadogradnju."
 
 # shell:upgrade-remove-1-4-confirm primary
 #: ../shell/shell.error.xml.h:9
@@ -21027,40 +19596,27 @@ msgstr "Zaista obrisati stare podatke?"
 
 #: ../shell/shell.error.xml.h:10
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
 "Ceo sadržaj fascikle &quot;evolution&quot; Ä?e biti trajno obrisan.\n"
 "\n"
-"Savetujemo da proverite da li postoje pošta, kontakti i kalendar, i da li "
-"ova verzija Evolucije ispravno radi pre brisanja starih podataka.\n"
+"Savetujemo da proverite da li postoje pošta, kontakti i kalendar, i da li ova verzija Evolucije ispravno radi pre brisanja starih podataka.\n"
 "\n"
-"Posle brisanja, ne možete da se vratite na prethodnu verziju Evolucije bez "
-"ruÄ?ne intervencije.\n"
+"Posle brisanja, ne možete da se vratite na prethodnu verziju Evolucije bez ruÄ?ne intervencije.\n"
 
 #: ../shell/shell.error.xml.h:16
-#, fuzzy
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
 msgstr ""
-"Prethodna verzija evolucije je smeštala svoje podatke na drugo mesto.\n"
+"Prethodna verzija Evolucije smeštala je podatke na drugu lokaciju.\n"
 "\n"
-"Ukoliko odluÄ?ite da uklonite ove podatke, ceo sadržaj fascikle &quot;"
-"evolution&quot; biÄ?e trajno obrisan. Ukoliko se odluÄ?ite da zadržite ove "
-"podatke, moraÄ?ete ruÄ?no da uklonite sadržaj iz &quot;evolution&quot;kada Vam "
-"odgovara.\n"
+"Ukoliko odluÄ?ite da uklonite ove podatke, ceo sadržaj direktorijuma &quot;evolution&quot; biÄ?e trajno uklonjen. Ukoliko se odluÄ?ite da zadržite ove podatke, moraÄ?ete ruÄ?no da uklonite sadržaj iz &quot;evolution&quot; kada Vam odgovara.\n"
 
 #: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
@@ -21068,14 +19624,11 @@ msgstr "Neuspela nadogradnja sa prethodne verzije: {0}"
 
 #: ../shell/shell.error.xml.h:21
 msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Nadogradnja podataka i podeÅ¡avanja Ä?e zahtevati do {0} prostora na disku, ali "
-"imate na raspolaganju samo {1}.\n"
+"Nadogradnja podataka i postavki Ä?e zahtevati do {0} prostora na disku, ali imate na raspolaganju samo {1}.\n"
 "\n"
 "MoraÄ?ete da oslobodite viÅ¡e mesta u liÄ?noj fascikli pre nego Å¡to nastavite."
 
@@ -21119,13 +19672,11 @@ msgstr "_Podseti me kasnije"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"Ukoliko odluÄ?ite da nastavite, možda neÄ?ete moÄ?i da pristupite nekim starim "
-"podacima.\n"
+"Ukoliko odluÄ?ite da nastavite, možda neÄ?ete moÄ?i da pristupite nekim starim podacima.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -21134,27 +19685,17 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"Setifikat â??%sâ?? je CA sertifikat.\n"
+"Sertifikat â??%sâ?? je CA sertifikat.\n"
 "\n"
-"Uredite podešavanja poverenja:"
+"Uredite postavke poverenja:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"PoÅ¡to verujete izdavaocu ovog sertifikata, onda verujete i u autentiÄ?nost "
-"ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
+#: ../smime/gui/cert-trust-dialog.c:150
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "PoÅ¡to verujete izdavaocu ovog sertifikata, onda verujete i u autentiÄ?nost ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
 
-#: ../smime/gui/cert-trust-dialog.c:155
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Pošto ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u "
-"autentiÄ?nost ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
+#: ../smime/gui/cert-trust-dialog.c:154
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "PoÅ¡to ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u autentiÄ?nost ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:383
@@ -21183,8 +19724,9 @@ msgstr "Ime sertifikata"
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Serijski broj"
 
@@ -21212,7 +19754,7 @@ msgstr "PregledaÄ? sertifikata: %s"
 #: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
-msgstr "Unesite lozinku za â??%sâ??"
+msgstr "Unesite lozinku za â??%sâ??"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -21295,14 +19837,11 @@ msgid "Backup All"
 msgstr "Rezerva svega"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, "
-"politiku i procedure (ako su dostupni)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, politiku i procedure (ako su dostupni)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Sertifikat"
 
@@ -21378,11 +19917,13 @@ msgstr "Organizaciona jedinica (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35
+#: ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "Sertifikat SSL klijenta"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "Sertifikat SSL servera"
 
@@ -21411,8 +19952,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Imate sertifikate ovih organizacija koji vas odreÄ?uju:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "Držite sertifikate koji odreÄ?uju ove izdavaoce sertifikata:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -21428,170 +19968,175 @@ msgid "_Edit CA Trust"
 msgstr "_Uredi poverenje u CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Sertifikat veÄ? postoji"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:222
+#: ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Potpiši"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Å ifruj"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Verzija"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Verzija 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Verzija 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Verzija 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 sa RSA Å¡ifrovanjem"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 sa RSA Å¡ifrovanjem"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA Å¡ifrovanjem"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Å¡ifrovanje"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Upotreba kljuÄ?a sertifikata"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape tip sertifikata"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "OdreÄ?ivaÄ? kljuÄ?a izdavaoca sertifikata"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "OdreÄ?ivaÄ? predmeta (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "OdreÄ?ivaÄ? algoritma"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom kljuÄ?u subjekta"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog kljuÄ?a subjekta"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Javni kljuÄ? subjekta"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791
+#: ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "GreÅ¡ka: nije moguÄ?a obrada proÅ¡irenja"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812
+#: ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Potpisnik predmeta"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL izdavaÄ? sertifikata"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "IzdavaÄ? sertifikata e-poÅ¡te"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Potpisivanje"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "ZamuÄ?ivanje kljuÄ?a"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "ZamuÄ?ivanje podataka"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Saglasnost kljuÄ?a"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Potpisnik sertifikata"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "KritiÄ?no"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Nije kritiÄ?no"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Proširenja"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072
+#: ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa sertifikata"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Izdavalac"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavaÄ?a"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
@@ -21623,7 +20168,7 @@ msgstr "Gašenje %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
-msgstr "Podešavanja imeni_ka"
+msgstr "Podešavanja adresa_ra"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
@@ -21635,23 +20180,24 @@ msgstr "Umnoži _sve kontakte u..."
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
-msgstr "Pred-pregled ko_ntakta"
+msgstr "Pre_gled kontakta"
 
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Umnoži"
 
 #: ../ui/evolution-addressbook.xml.h:7
-#, fuzzy
 msgid "Copy selected contacts to another folder"
-msgstr "Umnoži izabrane kontakte u drugu fasciklu..."
+msgstr "Umnoži izabrane kontakte u drugu fasciklu"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Umnoži kontakte izabrane fascikle u neku drugu fasciklu"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Umnoži izabrano"
 
@@ -21663,18 +20209,20 @@ msgstr "Umnoži u fasciklu..."
 msgid "Create a new address book folder"
 msgstr "Pravi novu fasciklu adresara"
 
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iseci"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Iseci izabrano"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "U_kloni imenik"
+msgstr "O_briši adresar"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
@@ -21693,9 +20241,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-#, fuzzy
 msgid "Move selected contacts to another folder"
-msgstr "Premesti izabrane kontakte u drugu fasciklu..."
+msgstr "Premesti izabrane kontakte u drugu fasciklu"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -21705,18 +20252,20 @@ msgstr "Premesti kontakte izabrane fascikle u neku drugu fasciklu"
 msgid "Move to Folder..."
 msgstr "Premesti u fasciklu..."
 
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ubaci"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Ubaci iz spiska iseÄ?aka"
 
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
-msgstr "Pregleda kontakte za Å¡tampu"
+msgstr "Pregleda kontakte pred Å¡tampu"
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
@@ -21728,22 +20277,22 @@ msgstr "Preimenuj izabranu fasciklu"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "_SaÄ?uvaj imenik kao VKartu"
+msgstr "_SaÄ?uvaj adresar kao VKartu"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "SaÄ?uvaj kao VKartu..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-#, fuzzy
 msgid "Save selected contacts as a VCard"
-msgstr "Ä?uva izabrane kontakte kao VKartu."
+msgstr "SaÄ?uvaj izabrane kontakte kao VKartu"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Ä?uva kontakte izabrane fascikle kao VKartu."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Izaberi sve"
 
@@ -21756,18 +20305,16 @@ msgid "Select all contacts"
 msgstr "Izaberi sve kontakte"
 
 #: ../ui/evolution-addressbook.xml.h:37
-#, fuzzy
 msgid "Send a message to the selected contacts"
-msgstr "Å alje poruku izabranim kontaktima."
+msgstr "Pošalji poruku izabranim kontaktima"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Å alje poruku kontaktu"
 
 #: ../ui/evolution-addressbook.xml.h:39
-#, fuzzy
 msgid "Send selected contacts to another person"
-msgstr "Å alje izabrane kontakte drugoj osobi."
+msgstr "Pošalji izabrane kontakte drugoj osobi"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -21789,7 +20336,8 @@ msgstr "Prekini uÄ?itavanje"
 msgid "View the current contact"
 msgstr "Pregledaj tekuÄ?i kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-addressbook.xml.h:45
+#: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Radnje"
@@ -21818,7 +20366,8 @@ msgstr "Premes_ti kontakt u..."
 msgid "_Move Folder Contacts To"
 msgstr "_Premesti kontakte iz fascikle u"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
@@ -21852,7 +20401,7 @@ msgstr "Obriši sve pojave"
 
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
-msgstr "Obriši zakazani sastanak"
+msgstr "Obriši zakazivanje"
 
 #: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
@@ -21878,17 +20427,19 @@ msgstr "Spisak"
 msgid "Month"
 msgstr "Mesec"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "SledeÄ?e"
 
 #: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
-msgstr "Pregleda kalendar za Å¡tampu"
+msgstr "Pregleda kalendar pred Å¡tampu"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Prethodno"
 
@@ -21896,13 +20447,14 @@ msgstr "Prethodno"
 msgid "Print this calendar"
 msgstr "Å tampa ovaj kalendar"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Izba_ci"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr "Izbaci stare sastanke"
+msgstr "Izbaci stara zakazivanja i sastanke"
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
@@ -21942,9 +20494,10 @@ msgstr "Prikaži radnu nedelju"
 
 #: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
-msgstr "Pregledaj tekuÄ?i sastanak"
+msgstr "Pregleda tekuÄ?e zakazivanje"
 
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
 msgstr "Pregleda poruke u konzoli za dijagnozu kvara"
 
@@ -21956,7 +20509,8 @@ msgstr "Nedelja"
 msgid "Work Week"
 msgstr "Radna nedelja"
 
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
 msgstr "Dnevnici _dijagnoze kvara"
 
@@ -21992,7 +20546,8 @@ msgstr "Preuzima poruke za naloge/fascikle koje su oznaÄ?ene za rad van mreže"
 msgid "Empty _Trash"
 msgstr "Izbaci _smeÄ?e"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "Fas_cikla"
 
@@ -22061,9 +20616,8 @@ msgstr "_Pregled"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-#, fuzzy
 msgid "_Subscriptions..."
-msgstr "_Prijave"
+msgstr "_Prijave..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
@@ -22119,8 +20673,7 @@ msgid "Hide _Read Messages"
 msgstr "Sakrij pro_Ä?itane poruke"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Sakrij obrisane poruke umesto njihovog precrtavanja"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -22200,14 +20753,15 @@ msgstr "Poruke po raspravama"
 msgid "_Group By Threads"
 msgstr "Grupiši po raspravama"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Poruka"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
-msgstr "Do_daj pošiljaoca u imenik"
+msgstr "Do_daj pošiljaoca u adresar"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
@@ -22216,7 +20770,7 @@ msgstr "Pri_meni filtere"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "Dodaj pošiljaoca u imenik"
+msgstr "Dodaj pošiljaoca u adresar"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
@@ -22455,199 +21009,184 @@ msgid "Paste messages from the clipboard"
 msgstr "Ubaci poruku(e) iz spiska iseÄ?aka"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "Pošalji no_vu poruku u fasciklu"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Pošalji od_govor"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Pošalji poruku u javnu fasciklu"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Pošalji odgovor na poruku u javnu fasciklu"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
-msgstr "Pregledaj poruku za Å¡tampu"
+msgstr "Pregledaj poruku pred Å¡tampu"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Å tampaj ovu poruku"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preu_smerava (bez Ä?itanja) izabranu poruku nekome"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Vrati tekst na originalnu veliÄ?inu"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "SaÄ?uvaj poruku kao tekstualnu datoteku"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "Fascikla pretrage na dopisnu _listu..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "Fascikla pretrage od prima_laca..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "Fascikla pretrage na n_aslov..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "Fascikla pretrage na _pošiljaoca..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Pretraži tekst u telu prikazane poruke"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Izaberi _sav tekst"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Izaberi sav tekst u poruci"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Podesi stranu za tekuÄ?i Å¡tampaÄ?"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikaži trepÄ?uÄ?i kursor u telu prikazanih poruka"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Prikaži poruku sa svim zaglavljima e-pošte"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Prikaži izvorni kod elektronske poruke"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Povrati izabrane poruke"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "P_ronaÄ?i u poruci..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "OznaÄ?_i kao zavrÅ¡eno"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Ä?ubre"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "_UÄ?itaj slike"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_SledeÄ?a poruka"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Normalna veliÄ?ina"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "Ni_je Ä?ubre"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_Citirano"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "Pro_Ä?itaj"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_SaÄ?uvaj poruku..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_NeproÄ?itano"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "Uv_eÄ?aj"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "Uv_eÄ?aj"
 
@@ -22655,9 +21194,10 @@ msgstr "Uv_eÄ?aj"
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
 msgid "Main toolbar"
-msgstr "Glavna paleta alata"
+msgstr "Glavna traka alata"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
@@ -22693,19 +21233,19 @@ msgstr "_Otvori belešku"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "Umnoži izabrana zaduženja"
+msgstr "Umnoži izabrane zadatke"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
-msgstr "Iseci izabrana zaduženja"
+msgstr "Iseci izabrane zadatke"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr "Obriši završena zaduženja"
+msgstr "Obriši završene zadatke"
 
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr "Obriši izabrana zaduženja"
+msgstr "Obriši izabrane zadatke"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
@@ -22713,35 +21253,35 @@ msgstr "Ozna_Ä?i kao zavrÅ¡eno"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr "Obeleži izabrana zaduženja kao završena"
+msgstr "Obeleži izabrane zadatke kao završene"
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
-msgstr "Ubaci zaduženja iz spiska iseÄ?aka"
+msgstr "Ubaci zadatke iz spiska iseÄ?aka"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "Pregleda spisak zaduženja za štampu"
+msgstr "Pregleda spisak zadataka pred Å¡tampu"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "Štampaj spisak zaduženja"
+msgstr "Å tampaj spisak zadataka"
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "Prikaži prozor za pregled zaduženja"
+msgstr "Prikaži prozor za pregled zadataka"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "Pregled za_duženja"
+msgstr "Pregled za_dataka"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
-msgstr "Pregleda izabrano zaduženje"
+msgstr "Pregleda izabrani zadatak"
 
 #: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
-msgstr "_Otvori zaduženje"
+msgstr "_Otvori zadatak"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -22749,11 +21289,11 @@ msgstr "O Evoluciji..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
-msgstr "Izmeni podešavanja Evolucije"
+msgstr "Izmeni postavke Evolucije"
 
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
-msgstr "Menja vidljivost palete alata"
+msgstr "Menja vidljivost trake alata"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
@@ -22761,8 +21301,7 @@ msgstr "Otvara nov prozor za prikaz ove fascikle"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Prikazuje dugmad prozora koriÅ¡Ä?enjem podeÅ¡avanja palete alata radne povrÅ¡ine"
+msgstr "Prikazuje dugmad prozora koriÅ¡Ä?enjem postavke treake alata radne povrÅ¡ine"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -22822,7 +21361,7 @@ msgstr "Po_desi stranu..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
-msgstr "Postav_ke"
+msgstr "Podeša_vanja"
 
 #: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
@@ -22834,7 +21373,7 @@ msgstr "Slanje / p_rimanje"
 
 #: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
-msgstr "Å alje pripremljene i dovlaÄ?i nove predmete"
+msgstr "Å alje pripremljene i dovlaÄ?i nove stavke"
 
 #: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
@@ -22842,15 +21381,15 @@ msgstr "Podešavanje Pilota"
 
 #: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
-msgstr "Prikaži boÄ?nu o_blast"
+msgstr "Prikaži boÄ?nu _traku"
 
 #: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
-msgstr "Prikaži _linija sa stanjem"
+msgstr "Prikaži traku _statusa"
 
 #: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
-msgstr "Prikaži _paletu alata"
+msgstr "Prikaži traku _alata"
 
 #: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
@@ -22874,15 +21413,15 @@ msgstr "Bira da li Ä?emo raditi van mreže."
 
 #: ../ui/evolution.xml.h:36
 msgid "Tool_bar Style"
-msgstr "Stil pa_lete alata"
+msgstr "Stil tra_ke alata"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
-msgstr "Prikaži/Sakrij boÄ?nu oblast"
+msgstr "Prikaži/sakrij boÄ?nu traku"
 
 #: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
-msgstr "Prikaži/Sakrij liniju stanja"
+msgstr "Prikaži/sakrij traku statusa"
 
 #: ../ui/evolution.xml.h:39
 msgid "Work _Offline"
@@ -22942,9 +21481,10 @@ msgstr "Prema _preduzeÄ?u"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr "_Karte imenika"
+msgstr "_Karte adresara"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Pregled _spiska"
 
@@ -22974,7 +21514,7 @@ msgstr "Kao fascikla _Poslato"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
-msgstr "Prema s_tanju"
+msgstr "Prema s_tatusu"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
@@ -23006,16 +21546,16 @@ msgstr "Sa _rokom"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "Sa _stanjem"
+msgstr "Sa _statusom"
 
 # Univerzalno vreme, ili UT
 # Valjda UV?
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -23037,26 +21577,25 @@ msgstr "Meni za podešavanje vremenske zone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Koristite levi taster miÅ¡a da uveÄ?ate mapu i izaberete vremensku zonu.\n"
 "Koristite desni taster miša za umanjivanje."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Zbirka"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Odredi preglede za %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Odredi preglede"
 
@@ -23066,18 +21605,17 @@ msgid "Define Views for \"%s\""
 msgstr "Odredi preglede za â??%sâ??"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabela"
 
 # bug(slobo): instanca, primerak, pogledaj...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Struktura"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "SaÄ?uvaj trenutni pregled"
 
@@ -23090,17 +21628,17 @@ msgid "_Replace existing view"
 msgstr "_Zameni postojeÄ?i pregled"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "PrilagoÄ?en pregled"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Ä?uva prilagoÄ?en pregled"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
@@ -23108,32 +21646,32 @@ msgstr "Odredi preglede..."
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Bira pregled: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je korisnik podesio"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "SaÄ?uvaj prilagoÄ?en pregled..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "Ä?uva trenutni korisniÄ?ki pregled"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Pravi ili menja preglede"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Proizvodnja"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Odredi novi pregled"
 
@@ -23149,64 +21687,200 @@ msgstr "Tip pregleda"
 msgid "Type of view:"
 msgstr "Tip pregleda:"
 
-#: ../widgets/misc/e-attachment-bar.c:1138
-msgid "Attachment Bar"
-msgstr "Linija priloga"
+#: ../widgets/misc/e-attachment.c:990
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "Attached message"
+msgstr "Priložena poruka"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773
+#: ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+#| msgid "attachment"
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1822
+#: ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Operacija uÄ?itavanja veÄ? je u toku"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1830
+#: ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "Operacija Ä?uvanja veÄ? je u toku"
+
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Nije moguÄ?e prilaganje datoteke %s: %s"
+#| msgid "Could not load address book"
+msgid "Could not load '%s'"
+msgstr "Nije moguÄ?e uÄ?itati â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:1926
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Nije moguÄ?e prilaganje datoteke %s: nije regularna datoteka"
+#| msgid "Content type of the attachment."
+msgid "Could not load the attachment"
+msgstr "Nije moguÄ?e uÄ?itati prilog"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "Nije moguÄ?e otvoriti â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+#| msgid "Could not open the link."
+msgid "Could not open the attachment"
+msgstr "Nije moguÄ?e otvoriti prilog"
+
+#: ../widgets/misc/e-attachment.c:2635
+#| msgid "An attachment to add."
+msgid "Attachment contents not loaded"
+msgstr "Sadržaj priloga nije uÄ?itan"
+
+# * found, so just bail completely.
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "Nije moguÄ?e saÄ?uvati â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+#| msgid "Content type of the attachment."
+msgid "Could not save the attachment"
+msgstr "Nije moguÄ?e saÄ?uvati prilog"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Ime datoteke:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+#| msgid "F_ilename:"
+msgid "_Filename:"
+msgstr "_Ime datoteke:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+#| msgid "MIME Type"
+msgid "MIME Type:"
 msgstr "MIME tip:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Predloži automatski prikaz priloga"
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#| msgid "Set as _Background"
+msgid "Could not set as background"
+msgstr "Nije moguÄ?e postaviti kao pozadinu"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#| msgid "Could not open the link."
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Ne mogu da otvorim vezu."
+msgstr[1] "Nije moguÄ?e poslati priloge"
+msgstr[2] "Nije moguÄ?e poslati priloga"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#| msgid "Send To:"
+msgid "_Send To..."
+msgstr "_Pošalji za..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#| msgid "Select folder to save selected attachments..."
+msgid "Send the selected attachments somewhere"
+msgstr "Å alje izabrane priloge negde"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#| msgid "Loading..."
+msgid "Loading"
+msgstr "UÄ?itavanje"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#| msgid "Shading"
+msgid "Saving"
+msgstr "Ä?uvanje"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "Sakrij li_niju priloga"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "Prikaži lini_ju priloga"
+
+#: ../widgets/misc/e-attachment-store.c:541
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgid "Add Attachment"
+msgstr "Dodaj prilog"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "Pri_loži"
+
+#: ../widgets/misc/e-attachment-store.c:607
+#| msgid "Save attachments"
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "SaÄ?uvaj prilog"
+msgstr[1] "SaÄ?uvaj priloge"
+msgstr[2] "SaÄ?uvaj priloga"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "SaÄ?_uvaj sve"
+
+#: ../widgets/misc/e-attachment-view.c:326
+#| msgid "_Add attachment..."
+msgid "A_dd Attachment..."
+msgstr "Do_daj prilog..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+#| msgid "Open in %s..."
+msgid "Open with \"%s\""
+msgstr "Otvori sa â??%sâ??"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+#| msgid "Remind _missing attachments"
+msgid "Open this attachment in %s"
+msgstr "Otvori ovaj prilog u %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "MeseÄ?ni kalendar"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645
-#: ../widgets/text/e-text.c:3646
+#: ../widgets/misc/e-canvas-background.c:455
+#: ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Boja ispunjavanja"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/misc/e-canvas-background.c:469
+#: ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK boja ispunjavanja"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/misc/e-canvas-background.c:476
+#: ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "IstaÄ?kaj"
 
@@ -23230,26 +21904,28 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Najmanja Å¡irina"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Najmanja Å¡irina"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101
+#: ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Razmak"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Sada"
 
@@ -23258,7 +21934,7 @@ msgstr "Sada"
 msgid "The time must be in the format: %s"
 msgstr "Vreme mora biti u formatu: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost postotka mora biti izmeÄ?u 0 i 100"
 
@@ -23318,13 +21994,16 @@ msgstr "Zapadnoevropska"
 msgid "Western European, New"
 msgstr "Zapadnoevropska, nova"
 
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Tradicionalna"
 
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Pojednostavljena"
 
@@ -23357,156 +22036,100 @@ msgstr "Drugo..."
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Datum i vreme"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Deo teksta za unos datuma"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Pritisnite na ovo dugme za prikaz kalendara"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "Okvir za izbor vremena"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_Danas"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Razgranato"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "Da li je stablo razgranato ili ne"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Tekst oznake stabla"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Koristi podvlaÄ?enje"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Ako je postavljeno, podvlaÄ?enje u tekstu oznaÄ?ava znak koji Ä?e se koristiti "
-"kao preÄ?ica na tastaturi"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Razmak izmeÄ?u oznake i sadržanog elementa"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Element oznake"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Element koji se prikazuje umesto obiÄ?ne oznake stabla"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "VeliÄ?ina stabla"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "VeliÄ?ina strelice stabla"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Razmak pokazivaÄ?a"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Razmak oko strelice stabla"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123
+#: ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306
+#: ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "SaÄ?uvaj pretragu"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Pretrage"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_SaÄ?uvaj pretragu..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi saÄ?uvane pretrage..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
 # bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "tekuÄ?em nalogu"
 
 # bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "tekuÄ?oj fascikli"
 
-# bug: requires a comment on usage
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "tekuÄ?oj poruci"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Izaberite sliku"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Karta sveta"
 
-#: ../widgets/misc/e-map.c:629
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Alat za izbor vremenske zone pomoÄ?u miÅ¡a. Tastaturom se izbor vremenske zone "
-"vrši iz donjeg okvira."
+#: ../widgets/misc/e-map.c:607
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "Alat za izbor vremenske zone pomoÄ?u miÅ¡a. Tastaturom se izbor vremenske zone vrÅ¡i iz donjeg okvira."
 
 #: ../widgets/misc/e-online-button.c:106
 msgid "Online"
@@ -23516,103 +22139,109 @@ msgstr "Na mreži"
 msgid "The button state is online"
 msgstr "Stanje dugmeta je na mreži"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Uskladi sa:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Uskladi liÄ?ne zapise:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Uskladi kategorije:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435
+#: ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Prazna poruka"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Model preispunjavanja"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Å irina kolone"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92
+#: ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "_Pretraži"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "Pro_naÄ?i sada"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_OÄ?isti"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
-msgstr "IB predmeta"
+msgstr "IB stavke"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/misc/e-search-bar.c:906
+#: ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "Prika_ži: "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "P_retraži"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " _u "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Red kursora"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Kolona kursora"
 
 # bug(slobo): možda razvrstavaÄ?
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "Razvrstavanje"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Režim izbora"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Režim kursora"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Kada je obri_sano:"
 
@@ -23630,25 +22259,25 @@ msgstr "<b>Povratno obaveštenje</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
-msgstr "<b>PraÄ?enje stanja</b>"
+msgstr "<b>PraÄ?enje statusa</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "A_utomatski briši poslat predmet"
+msgstr "A_utomatski briši poslatu stavku"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
-msgstr "Na_pravi poslat predmet za praÄ?enje podatka"
+msgstr "Na_pravi poslatu stavku za praÄ?enje podatka"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Ispo_ruÄ?eno i otvoreno"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
-msgstr "OpÅ¡_te moguÄ?nosti"
+msgstr "Opš_te opcije"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23656,7 +22285,7 @@ msgstr ""
 "Nema\n"
 "Primalac pošte"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23665,22 +22294,22 @@ msgid ""
 "Top Secret\n"
 "For Your Eyes Only"
 msgstr ""
-"Normanlna\n"
+"Normalna\n"
 "Zakonom zaÅ¡tiÄ?ena\n"
 "Poverljiva\n"
 "Tajna\n"
 "Vrhunska tajna\n"
 "Samo za tvoje oÄ?i"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "Zahtevan o_dgovor"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
-msgstr "PraÄ?enje sta_nja"
+msgstr "PraÄ?enje sta_tusa"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23692,30 +22321,35 @@ msgstr ""
 "ObiÄ?no\n"
 "Nisko"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Kada je pri_hvaÄ?eno: "
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Po završ_etku:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Kada je odbi_jeno:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "Un_utar"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_Posle:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Svi podaci"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+#| msgid "_Classification"
+msgid "_Classification:"
+msgstr "_Klasifikacija:"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23742,46 +22376,26 @@ msgid "_When opened:"
 msgstr "_Kada je otvoreno:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
-msgstr "Pritisnite ovde da posetite adresu"
-
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Uredi Listu glavnih kategorija..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Dostupne _kategorije:"
+msgstr "Kliknite ovde da posetite adresu"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "kategorije"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "iskaÄ?uÄ?a lista"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Izabrana kolona"
@@ -23794,23 +22408,23 @@ msgstr "Fokusirana kolona"
 msgid "Unselected Column"
 msgstr "Neizabrana kolona"
 
-#: ../widgets/table/e-cell-text.c:1799
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Precrtana kolona"
 
-#: ../widgets/table/e-cell-text.c:1806
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "PodvuÄ?ena kolona"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Podebljana kolona"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Kolona u boji"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Kolona boja u pozadini"
 
@@ -23818,11 +22432,13 @@ msgstr "Kolona boja u pozadini"
 msgid "State"
 msgstr "Stanje"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../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:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(OpadajuÄ?e)"
 
@@ -23834,12 +22450,12 @@ msgstr "Nije razvrstano"
 msgid "No grouping"
 msgstr "Bez grupisanja"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Prikaži polja"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Dostupna polja"
 
@@ -23848,7 +22464,7 @@ msgid "A_vailable Fields:"
 msgstr "Do_stupna polja:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "RastuÄ?e"
 
@@ -23861,13 +22477,13 @@ msgid "Clear _All"
 msgstr "OÄ?isti _sve"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "OpadajuÄ?e"
 
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "Grupiši predmete po"
+msgstr "Grupiši stavke po"
 
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
@@ -23895,7 +22511,7 @@ msgstr "Razvrstaj"
 
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
-msgstr "Razvrstaj predmete po"
+msgstr "Razvrstaj stavke po"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
@@ -23921,22 +22537,7 @@ msgstr "_Prikaži ova polja po redu:"
 msgid "_Sort..."
 msgstr "_Razvrstaj..."
 
-# Prevuci-i-Pusti
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "PiP kod"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "Puno zaglavlje"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Dodaj kolonu..."
 
@@ -23952,7 +22553,7 @@ msgstr ""
 "Za dodavanje kolone u tabelu, prevucite\n"
 "je na mesto gde želite da se pojavi."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23960,7 +22561,7 @@ msgstr[0] "%s : %s (%d stavka)"
 msgstr[1] "%s : %s (%d stavke)"
 msgstr[2] "%s : %s (%d stavki)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23968,1149 +22569,1690 @@ msgstr[0] "%s (%d stavka)"
 msgstr[1] "%s (%d stavke)"
 msgstr[2] "%s (%d stavki)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020
+#: ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Redovi naizmeniÄ?nih boja"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Položene linije za crtanje"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Uspravne linije za crtanje"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Središte crtanja"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048
+#: ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Režim kursora"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013
+#: ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Model za izbor"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055
+#: ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316
+#: ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "NajveÄ?a dužina"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089
+#: ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323
+#: ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "UjednaÄ?ena visina redova"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Zamrznuto"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "Razvrstaj _rastuÄ?e"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "Razvrstaj _opadajuÄ?e"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "_Ne razvrstavaj"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Grupiši po ovome _polju"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Grupiši po _okviru"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Ukloni ovu _kolonu"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Dodaj ko_lonu..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "Po_ravnanje"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "Na_jbolje uklapanje"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "Oblikuj kolo_ne..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pregled..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_PoreÄ?aj po"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_PrilagoÄ?eno"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "Opis fonta"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Detalji razvrstavanja"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Stablo"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Zaglavlje tabele"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Model tabele"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Red kursora"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Detalji razvrstavanja"
+
+#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Uvek pretraži"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Koristite klik da dodate"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Stablo"
+
+#: ../widgets/table/e-tree.c:3358
+#: ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree prilagoÄ?ivaÄ? tabele"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Starinski izgled"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Iscrtava linije i +/- graniÄ?nike."
 
-#: ../widgets/text/e-text.c:2737
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "VeliÄ?ina stabla"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "VeliÄ?ina strelice stabla"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Metodi unosa"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "ObraÄ?ivaÄ? dogaÄ?aja"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
+#: ../widgets/text/e-text.c:3569
+#: ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Precrtano"
 
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3576
+#: ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Veza"
 
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3583
+#: ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Obostrano"
 
-#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3590
+#: ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Iseci Å¡irinu"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Iseci visinu"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Iseci"
 
-#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Ispuni pravougaonik iseÄ?ka"
 
-#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X pomeranje"
 
-#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y pomeranje"
 
-#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675
+#: ../widgets/text/e-text.c:3660
+#: ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Å irina teksta"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Visina teksta"
 
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Koristi tri taÄ?ke"
 
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Tri taÄ?ke"
 
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Prelom reda"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Znaci za prelom"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Najviše linija"
 
-#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747
+#: ../widgets/text/e-text.c:3730
+#: ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Iscrtaj ivice"
 
-#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754
+#: ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Dozvoli nove linije"
 
-#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761
+#: ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Iscrtaj pozadinu"
 
-#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Iscrtaj dugme"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3759
 msgid "Cursor position"
-msgstr "Pozicija kurzora"
+msgstr "Pozicija kursora"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784
+#: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "Kontekst metoda unosa"
 
-#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791
+#: ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Upravljaj iskaÄ?uÄ?im prozorom"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Prikaz linije priloga"
+#~ msgid "activate"
+#~ msgstr "aktivirati"
+#~ msgid "3268"
+#~ msgstr "3268"
+#~ msgid "389"
+#~ msgstr "389"
+#~ msgid "636"
+#~ msgstr "636"
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Tip:</b>"
+#~ msgid "Add Address Book"
+#~ msgstr "Dodaj imenik"
+#~ msgid "Anonymously"
+#~ msgstr "Anonimno"
+#~ msgid "Basic"
+#~ msgstr "Osnovno"
+#~ msgid "Distinguished name"
+#~ msgstr "Posebno ime"
+#~ msgid "Email address"
+#~ msgstr "Elektronska adresa"
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "NaÄ?i moguÄ?e osnove za pretragu"
+#~ msgid "Search filter"
+#~ msgstr "Propusnik pretrage"
+#~ msgid "Sub"
+#~ msgstr "Pod"
+#~ msgid "Using email address"
+#~ msgstr "KoriÅ¡Ä?enje elektronske adrese"
+#~ msgid "Whenever Possible"
+#~ msgstr "Kad god je moguÄ?e"
+#~ msgid "_Add Address Book"
+#~ msgstr "_Dodaj imenik"
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN glasnik"
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+#~ msgid "_Notes:"
+#~ msgstr "_Beleške:"
+#~ msgid "United States"
+#~ msgstr "Sjedinjene Države"
+#~ msgid "Afghanistan"
+#~ msgstr "Avganistan"
+#~ msgid "Albania"
+#~ msgstr "Albanija"
+#~ msgid "Algeria"
+#~ msgstr "Alžir"
+#~ msgid "American Samoa"
+#~ msgstr "AmeriÄ?ka Samoa"
+#~ msgid "Andorra"
+#~ msgstr "Andora"
+#~ msgid "Angola"
+#~ msgstr "Angola"
+#~ msgid "Anguilla"
+#~ msgstr "Angila"
+#~ msgid "Antarctica"
+#~ msgstr "Antarktik"
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Antiga i Barbuda"
+#~ msgid "Argentina"
+#~ msgstr "Argentina"
+#~ msgid "Armenia"
+#~ msgstr "Jermenija"
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+#~ msgid "Australia"
+#~ msgstr "Australija"
+#~ msgid "Austria"
+#~ msgstr "Austrija"
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbejdžan"
+#~ msgid "Bahamas"
+#~ msgstr "Bahami"
+#~ msgid "Bahrain"
+#~ msgstr "Bahrein"
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladeš"
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+#~ msgid "Belarus"
+#~ msgstr "Belorusija"
+#~ msgid "Belgium"
+#~ msgstr "Belgija"
+#~ msgid "Belize"
+#~ msgstr "Belize"
+#~ msgid "Benin"
+#~ msgstr "Benin"
+#~ msgid "Bermuda"
+#~ msgstr "Bermuda"
+#~ msgid "Bhutan"
+#~ msgstr "Butan"
+#~ msgid "Bolivia"
+#~ msgstr "Bolivija"
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Bosna i Hercegovina"
+#~ msgid "Botswana"
+#~ msgstr "Bocvana"
+#~ msgid "Bouvet Island"
+#~ msgstr "Buve Ostrvo"
+#~ msgid "Brazil"
+#~ msgstr "Brazil"
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Britanska Teritorija Indijskog Okeana"
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunej Darusalam"
+#~ msgid "Bulgaria"
+#~ msgstr "Bugarska"
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+#~ msgid "Cambodia"
+#~ msgstr "Kambodža"
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+#~ msgid "Cape Verde"
+#~ msgstr "Zelenortska Ostrva"
+#~ msgid "Cayman Islands"
+#~ msgstr "Kajmanska Ostrva"
+#~ msgid "Central African Republic"
+#~ msgstr "CentralnoafriÄ?ka Republika"
+#~ msgid "Chad"
+#~ msgstr "Ä?ad"
+#~ msgid "Chile"
+#~ msgstr "Ä?ile"
+#~ msgid "China"
+#~ msgstr "Kina"
+#~ msgid "Christmas Island"
+#~ msgstr "BožiÄ?no Ostrvo"
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Kokos (Kiling) Ostrva"
+#~ msgid "Colombia"
+#~ msgstr "Kolumbija"
+#~ msgid "Comoros"
+#~ msgstr "Komori"
+#~ msgid "Congo"
+#~ msgstr "Kongo"
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Kongo, Demokratska Republika"
+#~ msgid "Cook Islands"
+#~ msgstr "Kuk Ostrva"
+#~ msgid "Costa Rica"
+#~ msgstr "Kostarika"
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Obala SlonovaÄ?e"
+#~ msgid "Croatia"
+#~ msgstr "Hrvatska"
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
+#~ msgid "Cyprus"
+#~ msgstr "Kipar"
+#~ msgid "Czech Republic"
+#~ msgstr "Ä?eÅ¡ka Republika"
+#~ msgid "Denmark"
+#~ msgstr "Danska"
+#~ msgid "Djibouti"
+#~ msgstr "Džibuti"
+#~ msgid "Dominica"
+#~ msgstr "Dominika"
+#~ msgid "Dominican Republic"
+#~ msgstr "Dominikanska Republika"
+#~ msgid "Ecuador"
+#~ msgstr "Ekvador"
+#~ msgid "Egypt"
+#~ msgstr "Egipat"
+#~ msgid "El Salvador"
+#~ msgstr "El Salvador"
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Ekvatorijalna Gvineja"
+#~ msgid "Eritrea"
+#~ msgstr "Eritreja"
+#~ msgid "Estonia"
+#~ msgstr "Estonija"
+#~ msgid "Ethiopia"
+#~ msgstr "Etiopija"
+#~ msgid "Falkland Islands"
+#~ msgstr "Foklandska Ostrva"
+#~ msgid "Faroe Islands"
+#~ msgstr "Farska Ostrva"
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
+#~ msgid "Finland"
+#~ msgstr "Finska"
+#~ msgid "France"
+#~ msgstr "Francuska"
+#~ msgid "French Guiana"
+#~ msgstr "Francuska Gijana"
+#~ msgid "French Polynesia"
+#~ msgstr "Francuska Polinezija"
+#~ msgid "French Southern Territories"
+#~ msgstr "Francuske Južne Teritorije"
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+#~ msgid "Gambia"
+#~ msgstr "Gambija"
+#~ msgid "Georgia"
+#~ msgstr "Gruzija"
+#~ msgid "Germany"
+#~ msgstr "NemaÄ?ka"
+#~ msgid "Ghana"
+#~ msgstr "Gana"
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+#~ msgid "Greece"
+#~ msgstr "GrÄ?ka"
+#~ msgid "Greenland"
+#~ msgstr "Grenland"
+#~ msgid "Grenada"
+#~ msgstr "Grenada"
+#~ msgid "Guadeloupe"
+#~ msgstr "Gvadalup"
+#~ msgid "Guam"
+#~ msgstr "Guam"
+#~ msgid "Guatemala"
+#~ msgstr "Gvatemala"
+#~ msgid "Guernsey"
+#~ msgstr "Gvirnzi"
+#~ msgid "Guinea"
+#~ msgstr "Gvineja"
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Gvineja-Bisao"
+#~ msgid "Guyana"
+#~ msgstr "Gvajana"
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Herd i Mekdonald Ostrva"
+#~ msgid "Holy See"
+#~ msgstr "Sveta Stolica"
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+#~ msgid "Hungary"
+#~ msgstr "MaÄ?arska"
+#~ msgid "Iceland"
+#~ msgstr "Island"
+#~ msgid "India"
+#~ msgstr "Indija"
+#~ msgid "Indonesia"
+#~ msgstr "Indonezija"
+#~ msgid "Iran"
+#~ msgstr "Iran"
+#~ msgid "Iraq"
+#~ msgstr "Irak"
+#~ msgid "Ireland"
+#~ msgstr "Irska"
+#~ msgid "Isle of Man"
+#~ msgstr "Ä?ovekovo Ostrvo"
+#~ msgid "Israel"
+#~ msgstr "Izrael"
+#~ msgid "Italy"
+#~ msgstr "Italija"
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
+#~ msgid "Japan"
+#~ msgstr "Japan"
+#~ msgid "Jersey"
+#~ msgstr "Džersi"
+#~ msgid "Jordan"
+#~ msgstr "Jordan"
+#~ msgid "Kazakhstan"
+#~ msgstr "Kazahstan"
+#~ msgid "Kenya"
+#~ msgstr "Kenija"
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Koreja, Demokratska Narodna Republika"
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Koreja, Republika"
+#~ msgid "Kuwait"
+#~ msgstr "Kuvajt"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kirgistan"
+#~ msgid "Laos"
+#~ msgstr "Laos"
+#~ msgid "Latvia"
+#~ msgstr "Latvija"
+#~ msgid "Lebanon"
+#~ msgstr "Liban"
+#~ msgid "Lesotho"
+#~ msgstr "Lesoto"
+#~ msgid "Liberia"
+#~ msgstr "Liberija"
+#~ msgid "Libya"
+#~ msgstr "Libija"
+#~ msgid "Liechtenstein"
+#~ msgstr "Lihtenštajn"
+#~ msgid "Lithuania"
+#~ msgstr "Litvanija"
+#~ msgid "Luxembourg"
+#~ msgstr "Luksemburg"
+#~ msgid "Macao"
+#~ msgstr "Makao"
+#~ msgid "Macedonia"
+#~ msgstr "Makedonija"
+#~ msgid "Madagascar"
+#~ msgstr "Madagaskar"
+#~ msgid "Malawi"
+#~ msgstr "Malavi"
+#~ msgid "Malaysia"
+#~ msgstr "Malezija"
+#~ msgid "Maldives"
+#~ msgstr "Maldivi"
+#~ msgid "Mali"
+#~ msgstr "Mali"
+#~ msgid "Malta"
+#~ msgstr "Malta"
+#~ msgid "Marshall Islands"
+#~ msgstr "Maršalova Ostrva"
+#~ msgid "Martinique"
+#~ msgstr "Martinik"
+#~ msgid "Mauritania"
+#~ msgstr "Mauritanija"
+#~ msgid "Mauritius"
+#~ msgstr "Mauricijus"
+#~ msgid "Mayotte"
+#~ msgstr "Mejot"
+#~ msgid "Mexico"
+#~ msgstr "Meksiko"
+#~ msgid "Micronesia"
+#~ msgstr "Mikronezija"
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Moldavija, Republika"
+#~ msgid "Monaco"
+#~ msgstr "Monako"
+#~ msgid "Mongolia"
+#~ msgstr "Mongolija"
+#~ msgid "Montserrat"
+#~ msgstr "Monserat"
+#~ msgid "Morocco"
+#~ msgstr "Maroko"
+#~ msgid "Mozambique"
+#~ msgstr "Mozambik"
+#~ msgid "Myanmar"
+#~ msgstr "Mianmar"
+#~ msgid "Namibia"
+#~ msgstr "Namibija"
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+#~ msgid "Nepal"
+#~ msgstr "Nepal"
+#~ msgid "Netherlands"
+#~ msgstr "Holandija"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Holandski Antili"
+#~ msgid "New Caledonia"
+#~ msgstr "Nova Kaledonija"
+#~ msgid "New Zealand"
+#~ msgstr "Novi Zeland"
+#~ msgid "Nicaragua"
+#~ msgstr "Nikaragva"
+#~ msgid "Niger"
+#~ msgstr "Niger"
+#~ msgid "Nigeria"
+#~ msgstr "Nigerija"
+#~ msgid "Niue"
+#~ msgstr "Niu"
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk Ostrva"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Ostrva Severna Mariana"
+#~ msgid "Norway"
+#~ msgstr "Norveška"
+#~ msgid "Oman"
+#~ msgstr "Oman"
+#~ msgid "Pakistan"
+#~ msgstr "Pakistan"
+#~ msgid "Palau"
+#~ msgstr "Palau"
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestinska Teritorija"
+#~ msgid "Panama"
+#~ msgstr "Panama"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua Nova Gvineja"
+#~ msgid "Paraguay"
+#~ msgstr "Paragvaj"
+#~ msgid "Peru"
+#~ msgstr "Peru"
+#~ msgid "Philippines"
+#~ msgstr "Filipini"
+#~ msgid "Pitcairn"
+#~ msgstr "Pitkern"
+#~ msgid "Poland"
+#~ msgstr "Poljska"
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+#~ msgid "Puerto Rico"
+#~ msgstr "Portoriko"
+#~ msgid "Qatar"
+#~ msgstr "Katar"
+
+# Za ovu državu nisam Ä?uo ni u snu, tako da sam ostavio u originalu. -- Pa kada si neobrazovan. :)
+#~ msgid "Reunion"
+#~ msgstr "Reunion"
+#~ msgid "Romania"
+#~ msgstr "Rumunija"
+#~ msgid "Russian Federation"
+#~ msgstr "Ruska Federacija"
+#~ msgid "Rwanda"
+#~ msgstr "Ruanda"
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Sveti Kits i Nevis"
+#~ msgid "Saint Lucia"
+#~ msgstr "Sveta Lucija"
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Sveti Vinsent i Grenadini"
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Sao Tome i Principe"
+#~ msgid "Saudi Arabia"
+#~ msgstr "Saudijska Arabija"
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Srbija i Crna Gora"
+#~ msgid "Seychelles"
+#~ msgstr "Sejšeli"
+#~ msgid "Sierra Leone"
+#~ msgstr "Sijera Leone"
+#~ msgid "Singapore"
+#~ msgstr "Singapur"
+#~ msgid "Slovakia"
+#~ msgstr "SlovaÄ?ka"
+#~ msgid "Slovenia"
+#~ msgstr "Slovenija"
+#~ msgid "Solomon Islands"
+#~ msgstr "Solomonska Ostrva"
+#~ msgid "Somalia"
+#~ msgstr "Somalija"
+#~ msgid "South Africa"
+#~ msgstr "Južna Afrika"
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Južna Džordžija i Južna SendviÄ? Ostrva"
+#~ msgid "Spain"
+#~ msgstr "Å panija"
+#~ msgid "Sri Lanka"
+#~ msgstr "Å ri Lanka"
+#~ msgid "St. Helena"
+#~ msgstr "Sv. Jelena"
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "Sv. Pjer i Mikelon"
+#~ msgid "Sudan"
+#~ msgstr "Sudan"
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Svalbard i Jan Majen Ostrva"
+#~ msgid "Swaziland"
+#~ msgstr "Svazilend"
+#~ msgid "Sweden"
+#~ msgstr "Å vedska"
+#~ msgid "Switzerland"
+#~ msgstr "Å vajcarska"
+#~ msgid "Syria"
+#~ msgstr "Sirija"
+#~ msgid "Taiwan"
+#~ msgstr "Tajvan"
+#~ msgid "Tajikistan"
+#~ msgstr "Tadžikistan"
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Tanzanija, Ujedinjena Republika"
+#~ msgid "Thailand"
+#~ msgstr "Tajland"
+#~ msgid "Timor-Leste"
+#~ msgstr "Timor-Lest"
+#~ msgid "Togo"
+#~ msgstr "Togo"
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad i Tobago"
+#~ msgid "Tunisia"
+#~ msgstr "Tunis"
+#~ msgid "Turkey"
+#~ msgstr "Turska"
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistan"
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Turks i Kokos Ostrva"
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+#~ msgid "Ukraine"
+#~ msgstr "Ukrajina"
+#~ msgid "United Arab Emirates"
+#~ msgstr "Ujedinjeni Arapski Emirati"
+#~ msgid "United Kingdom"
+#~ msgstr "Velika Britanija"
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Rubna Ostrva SAD"
+#~ msgid "Uruguay"
+#~ msgstr "Urugvaj"
+#~ msgid "Uzbekistan"
+#~ msgstr "Uzbekistan"
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+#~ msgid "Venezuela"
+#~ msgstr "Venecuela"
+#~ msgid "Viet Nam"
+#~ msgstr "Vijetnam"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Britanska DeviÄ?anska Ostrva"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "AmeriÄ?ka DeviÄ?anska Ostrva"
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Volis i Futuna Ostrva"
+#~ msgid "Western Sahara"
+#~ msgstr "Zapadna Sahara"
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
+#~ msgid "Zambia"
+#~ msgstr "Zambija"
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabve"
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL brzi glasnik"
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo glasnik"
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu'Gadu glasnik"
+#~ msgid "Service"
+#~ msgstr "Servis"
+#~ msgid "Username"
+#~ msgstr "KorisniÄ?ko ime"
+#~ msgid "Address _2:"
+#~ msgstr "Adresa _2:"
+#~ msgid "Ci_ty:"
+#~ msgstr "_Grad:"
+#~ msgid "Countr_y:"
+#~ msgstr "Držav_a:"
+#~ msgid "Full Address"
+#~ msgstr "Puna adresa"
+#~ msgid "_ZIP Code:"
+#~ msgstr "_Poštanski broj:"
+#~ msgid "Dr."
+#~ msgstr "Dr"
+#~ msgid "Esq."
+#~ msgstr "Poš."
+#~ msgid "I"
+#~ msgstr "I"
+#~ msgid "II"
+#~ msgstr "II"
+#~ msgid "III"
+#~ msgstr "III"
+#~ msgid "Jr."
+#~ msgstr "Ml."
+#~ msgid "Miss"
+#~ msgstr "G-Ä?ica"
+#~ msgid "Mr."
+#~ msgstr "G."
+#~ msgid "Mrs."
+#~ msgstr "G-Ä?a"
+#~ msgid "Ms."
+#~ msgstr "G-Ä?a"
+#~ msgid "Sr."
+#~ msgstr "St."
+#~ msgid "Add IM Account"
+#~ msgstr "Dodaj nalog brzog glasnika"
+#~ msgid "_Account name:"
+#~ msgstr "Ime n_aloga:"
+#~ msgid "_IM Service:"
+#~ msgstr "Usluga _brzog glasnika:"
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 p. Tahoma"
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 p. Tahoma"
+#~ msgid "Blank forms at end:"
+#~ msgstr "Prazni obrasci na kraju:"
+#~ msgid "Body"
+#~ msgstr "Telo"
+#~ msgid "Bottom:"
+#~ msgstr "Dno:"
+#~ msgid "Dimensions:"
+#~ msgstr "Dimenzije:"
+#~ msgid "F_ont..."
+#~ msgstr "F_ont..."
+#~ msgid "Fonts"
+#~ msgstr "Slovni lik"
+#~ msgid "Footer:"
+#~ msgstr "Podnožje:"
+#~ msgid "Header/Footer"
+#~ msgstr "Zaglavlje/podnožje"
+#~ msgid "Headings"
+#~ msgstr "Zaglavlja"
+#~ msgid "Headings for each letter"
+#~ msgstr "Zaglavlja za svako pismo"
+#~ msgid "Height:"
+#~ msgstr "Visina:"
+#~ msgid "Immediately follow each other"
+#~ msgstr "Odmah prati jedno drugo"
+#~ msgid "Include:"
+#~ msgstr "UkljuÄ?uje:"
+#~ msgid "Landscape"
+#~ msgstr "Položeno"
+#~ msgid "Left:"
+#~ msgstr "Levo:"
+#~ msgid "Letter tabs on side"
+#~ msgstr "JeziÄ?ci sa slovima sa strane"
+#~ msgid "Margins"
+#~ msgstr "Margine"
+#~ msgid "Number of columns:"
+#~ msgstr "Broj kolona:"
+#~ msgid "Options"
+#~ msgstr "Opcije"
+#~ msgid "Orientation"
+#~ msgstr "Položaj"
+#~ msgid "Page"
+#~ msgstr "Strana"
+#~ msgid "Page Setup:"
+#~ msgstr "Podešavanje strane:"
+#~ msgid "Paper"
+#~ msgstr "Papir"
+#~ msgid "Paper source:"
+#~ msgstr "Izvor papira:"
+#~ msgid "Portrait"
+#~ msgstr "Uspravno"
+#~ msgid "Preview:"
+#~ msgstr "Pregled:"
+#~ msgid "Print using gray shading"
+#~ msgstr "Å tampaj koristeÄ?i sive tonove"
+#~ msgid "Reverse on even pages"
+#~ msgstr "Obrnuto na parnim stranama"
+#~ msgid "Right:"
+#~ msgstr "Desno:"
+#~ msgid "Sections:"
+#~ msgstr "Odeljci:"
+#~ msgid "Start on a new page"
+#~ msgstr "PoÄ?ni na novoj strani"
+#~ msgid "Style name:"
+#~ msgstr "Ime stila:"
+#~ msgid "Top:"
+#~ msgstr "Vrh:"
+#~ msgid "Width:"
+#~ msgstr "Å irina:"
+#~ msgid "_Font..."
+#~ msgstr "_Slovni lik..."
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr ""
+#~ "Dali da se koristi letnje raÄ?unanje vremena kada se prikazuju dogaÄ?aji."
+#~ msgid "daylight savings time"
+#~ msgstr "Letnje raÄ?unanje vremena"
+#~ msgid "after"
+#~ msgstr "posle"
+#~ msgid "day(s)"
+#~ msgstr "dan(i)"
+#~ msgid "end of appointment"
+#~ msgstr "kraj sastanka"
+#~ msgid "hour(s)"
+#~ msgstr "sat(i)"
+# bug: plural-forms
+#~ msgid "minute(s)"
+#~ msgstr "minut(i)"
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Podesi za _letnje raÄ?unanje vremena"
+#~ msgid "Attached message - %s"
+#~ msgstr "Priložena poruka - %s"
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> prilog"
+#~ msgstr[1] "<b>%d</b> priloga"
+#~ msgstr[2] "<b>%d</b> priloga"
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "Sakrij liniju pri_loga"
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Prikaži liniju p_riloga"
+#~ msgid "Show Attachments"
+#~ msgstr "Prikaži p_riloge"
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Pritisnite razmak za prikaz(sakrivanje) linije priloga"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 dan pre zakazanog sastanka"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 sat pre zakazanog sastanka"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minuta pre zakazanog sastanka"
+#~ msgid "for"
+#~ msgstr "za"
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>UÄ?esni_ci</b>"
+#~ msgid "C_hange Organizer"
+#~ msgstr "_Promeni organizatora"
+#~ msgid "Co_ntacts..."
+#~ msgstr "Konta_kti..."
+#~ msgid "forever"
+#~ msgstr "uvek"
+#~ msgid "month(s)"
+#~ msgstr "mesec(i)"
+#~ msgid "week(s)"
+#~ msgstr "nedelja(e)"
+#~ msgid "year(s)"
+#~ msgstr "godina(e)"
+#~ msgid "_Save Selected"
+#~ msgstr "_SaÄ?uvaj izabrano"
+#~ msgid "April"
+#~ msgstr "April"
+#~ msgid "August"
+#~ msgstr "Avgust"
+#~ msgid "December"
+#~ msgstr "Decembar"
+#~ msgid "February"
+#~ msgstr "Februar"
+#~ msgid "January"
+#~ msgstr "Januar"
+#~ msgid "July"
+#~ msgstr "Jul"
+#~ msgid "June"
+#~ msgstr "Jun"
+#~ msgid "March"
+#~ msgstr "Mart"
+#~ msgid "May"
+#~ msgstr "Maj"
+#~ msgid "November"
+#~ msgstr "Novembar"
+#~ msgid "October"
+#~ msgstr "Oktobar"
+#~ msgid "September"
+#~ msgstr "Septembar"
+#~ msgid "Could not open autosave file"
+#~ msgstr "Nije moguÄ?e otvoriti automatski saÄ?uvanu datoteku"
+#~ msgid "_Post-To Field"
+#~ msgstr "_Pošalji polje"
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Bira da li je polje Pošalji prikazano"
+#~ msgid "_Subject Field"
+#~ msgstr "Polje za _temu"
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Bira da li da prikaže polje za temu"
+#~ msgid "_To Field"
+#~ msgstr "_Prima polje"
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Bira da li je polje Prima prikazano"
+#~ msgid "ago"
+#~ msgstr "pre"
+#~ msgid "months"
+#~ msgstr "meseci"
+#~ msgid "the current time"
+#~ msgstr "trenutno vreme"
+#~ msgid "the time you specify"
+#~ msgstr "vreme koje odredite"
+#~ msgid "years"
+#~ msgstr "godine"
+#~ msgid "Retrieving Message..."
+#~ msgstr "DovlaÄ?enje poruke..."
+#~ msgid "C_all To..."
+#~ msgstr "P_oziv za..."
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "Završeno u %B %d, %Y, %l:%M %p"
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "do %B %d, %Y, %l:%M %p"
+#~ msgid "Save attachment as"
+#~ msgstr "SaÄ?uvaj prilog kao"
+#~ msgid "Select folder to save all attachments"
+#~ msgstr "Izaberite fasciklu za Ä?uvanje svih priloga"
+#~ msgid "_Save Selected..."
+#~ msgstr "Izabrano Ä?uvanje..."
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d pri_log"
+#~ msgstr[1] "%d pri_loga"
+#~ msgstr[2] "%d pri_loga"
+#~ msgid "S_ave"
+#~ msgstr "_SaÄ?uvaj"
+#~ msgid "No Attachment"
+#~ msgstr "Nema priloga"
+#~ msgid " (%a, %R %Z)"
+#~ msgstr "(%a, %R %Z)"
+#~ msgid " (%R %Z)"
+#~ msgstr "(%R %Z)"
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "UkljuÄ?i moguÄ?nost pretrage u boÄ?noj oblasti tako da možete pokrenuti "
+#~ "interaktivnu pretragu kucajuÄ?i u polje za tekst. Korist je da možete lako "
+#~ "naÄ?i fasciklu u toj boÄ?noj oblasti samo kucajuÄ?i ime fascikle i izbor "
+#~ "skaÄ?e automatski na tu fasciklu."
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana"
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana."
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Opcija Pregled/kopija (Cc) je izabrana"
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Opcija Pregled/kopija (Cc) je izabrana."
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Opcija Pregled/Å¡alje je izabrana"
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Opcija Pregled/Å¡alje je izabrana."
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Opcija Pregled/prima je izabrana"
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Opcija Pregled/pošalji je izabrana."
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Opcija Pregled/odgovor je izabrana"
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Opcija Pregled/odgovor je izabrana."
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr " _Proveri podržane tipove "
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "_Proveri podržane tipove "
+#~ msgid "Do not quote"
+#~ msgstr "Ne citiraj"
+#~ msgid "Inline"
+#~ msgstr "Unutar"
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "Unutar (Outlook stil)"
+#~ msgid "Quoted"
+#~ msgstr "Citirano"
+#~ msgid "S_OCKS Host:"
+#~ msgstr "DomaÄ?in za S_OCKS:"
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Odabira fasciklu Priprema"
+#~ msgid "Select Sent Folder"
+#~ msgstr "Odabira fasciklu Poslato"
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "_Automatsko podešavanje posrednika:"
+#~ msgid "Case _sensitive"
+#~ msgstr "_Osetljivo na veliÄ?inu slova"
+#~ msgid "F_ind:"
+#~ msgstr "Pro_naÄ?i:"
+#~ msgid "Find in Message"
+#~ msgstr "PronaÄ?i u poruci"
+#~ msgid "None Selected"
+#~ msgstr "Ništa nije izabrano"
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "ObezbeÄ?uje osnovnu funkcionalnost za lokalne imenike."
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Traga za predmetima u kojima se može nalaziti prilog u poruci i upozorava "
+#~ "ukoliko priloga nema"
+#, fuzzy
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "Dodatak za oblikovanje koji prikazuje zvuÄ?ne priloge unutar poruke i "
+#~ "dozvoljava njihovo puštanje direktno iz evolucije."
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr ""
+#~ "Dodatak za izradu rezerve i oporavak podataka i podešavanja Evolucije."
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV izvori kalendara"
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Daje osnovnu upotrebu lokalnim kalendarima."
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP Kalendari"
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "Daje osnovnu upotrebu http kalendarima i onim na vebu."
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Daje osnovnu upotrebu kalendarima vremena."
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "Probni dodatak koji pokazuje iskaÄ?uÄ?i meni za umnožavanje stvari u listu "
+#~ "iseÄ?aka."
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "ObezbeÄ?uje funkcionalnost za obeležavanje nekog kalendara ili imenika kao "
+#~ "podrazumevanog."
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "PrikljuÄ?ak koji rukuje zbirkom naroÄ?itih radnji i svojstava nad nalozima za "
+#~ "Exchange."
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "Sastavite poruke koriÅ¡Ä?enjem drugog ureÄ?ivaÄ?a"
+
+#, fuzzy
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "Dozvoljava odjavu fascikli za poštu u meniju desnim klikom na stablo "
+#~ "fascikli."
+
+#, fuzzy
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "PrikljuÄ?ak za postavljanje kalendara i kontakata za google."
+#~ msgid "Google sources"
+#~ msgstr "Izvori Google"
+
+#, fuzzy
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "Dodatak za nameštanje izvora grupnih kalendara i imenika."
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Dodatak za nameštanje Hulinih izvora kalendara."
+#~ msgid "Hula Account Setup"
+#~ msgstr "Podešavanje Hula naloga"
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Dodatak za moguÄ?nosti IMAP naloga."
+#~ msgid "_Import to Calendar"
+#~ msgstr "Izvez_i u kalendar"
+#~ msgid "Import ICS"
+#~ msgstr "Uvezi Internet kalendar"
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "Uvozi ICS priloge u kalendar."
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "UsklaÄ?uje izabrano zaduženje/beleÅ¡ku/kalendar/adresar sa džepnim ureÄ?ajem "
+#~ "Apple iPod"
+#~ msgid "_Tasks :"
+#~ msgstr "Za_duženja:"
+#~ msgid "Memos :"
+#~ msgstr "Beleške :"
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Dozvoljava iskljuÄ?ivanje naloga."
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "Stvara D-Bus poruku ili obaveštava korisnika ikonom u obaveštajnoj zoni i "
+#~ "obaveštenjem kada stigne nova poruka."
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr ""
+#~ "Dodatak koji omoguÄ?ava pravljenje sastanaka iz sadržaja elektronske poruke."
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "Prome_ni u sastanak"
+#~ msgid "Mail to meeting"
+#~ msgstr "Pošalji poruku za sastanak"
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "Dodatak koji omoguÄ?ava pravljenje zaduženja iz sadržaja elektronske poruke."
+#~ msgid "Con_vert to Task"
+#~ msgstr "Pro_meni u zaduženje"
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Koristi se za obeležavanje svih poruka u fascikli da budu proÄ?itane"
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Dodatak koji uvodi mono dodatke."
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "Dodatak za ukljuÄ?ivanje i iskljuÄ?ivanje drugih dodataka."
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "Probni dodatak koji pokazuje kako dodatak za oblikovanje omoguÄ?ava "
+#~ "iskljuÄ?ivanje HTML poÅ¡te.\n"
+#~ "\n"
+#~ "Ovaj dodatak je samo za potrebe demonstracije.\n"
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Upisuje dnevnik ispitivaÄ?kih dogaÄ?aja."
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "Spam ubica (ugraÄ?en)"
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "Filtrira neželjenu poÅ¡tu koristeÄ?i Ubicu spama. Ovaj dodatak zahteva "
+#~ "njegovu ponovnu instalaciju."
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "Dodatak za Ä?uvanje svih priloga ili delova poruke odjednom."
+#~ msgid "Save Attachments..."
+#~ msgstr "SaÄ?uvaj priloge..."
+#~ msgid "Save all attachments"
+#~ msgstr "SaÄ?uvaj sve priloge"
+#~ msgid "Select save base name"
+#~ msgstr "Izaberi ime za snimanje baze"
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "Obaveštava ako nizanje poruka treba da se vrati na naslov."
+
+#, fuzzy
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "Jednostavan dodatak koji koristi ytnef za dekodiranje tnef priloga."
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "PrikljuÄ?ak za postavljanje WebDAV kontakata."
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Pošalji no_vu poruku u fasciklu"
+#~ msgid "Post a Repl_y"
+#~ msgstr "Pošalji od_govor"
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Pošalji poruku u javnu fasciklu"
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Pošalji odgovor na poruku u javnu fasciklu"
+#~ msgid "Attachment Bar"
+#~ msgstr "Linija priloga"
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Nije moguÄ?e prilaganje datoteke %s: %s"
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "Nije moguÄ?e prilaganje datoteke %s: nije regularna datoteka"
+#~ msgid "MIME type:"
+#~ msgstr "MIME tip:"
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Predloži automatski prikaz priloga"
+#~ msgid "Expanded"
+#~ msgstr "Razgranato"
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "Da li je stablo razgranato ili ne"
+#~ msgid "Text of the expander's label"
+#~ msgstr "Tekst oznake stabla"
+#~ msgid "Use underline"
+#~ msgstr "Koristi podvlaÄ?enje"
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "Ako je postavljeno, podvlaÄ?enje u tekstu oznaÄ?ava znak koji Ä?e se koristiti "
+#~ "kao preÄ?ica na tastaturi"
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "Razmak izmeÄ?u oznake i sadržanog elementa"
+#~ msgid "Label widget"
+#~ msgstr "Element oznake"
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "Element koji se prikazuje umesto obiÄ?ne oznake stabla"
+#~ msgid "Indicator Spacing"
+#~ msgstr "Razmak pokazivaÄ?a"
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Razmak oko strelice stabla"
+
+# bug: requires a comment on usage
+#~ msgid "Current Message"
+#~ msgstr "tekuÄ?oj poruci"
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Uredi Listu glavnih kategorija..."
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
+#~ msgid "_Available Categories:"
+#~ msgstr "Dostupne _kategorije:"
+#~ msgid "categories"
+#~ msgstr "kategorije"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+# Prevuci-i-Pusti
+#~ msgid "DnD code"
+#~ msgstr "PiP kod"
+#~ msgid "Full Header"
+#~ msgstr "Puno zaglavlje"
+#~ msgid "Font Description"
+#~ msgstr "Opis fonta"
 #~ msgid "Novell Groupwise"
 #~ msgstr "Novell Groupwise"
-
 #~ msgid ""
 #~ "We were unable to open this address book.  This either means you have "
 #~ "entered an incorrect URI, or the LDAP server is unreachable."
 #~ msgstr ""
 #~ "Otvaranje ovog adresara nije moguÄ?e.  To znaÄ?i da ste ili uneli pogreÅ¡nu "
 #~ "adresu, ili je LDAP server nedostupan."
-
 #~ msgid "Contact Print Style Editor Test"
 #~ msgstr "Proba ureÄ?ivaÄ?a stila za Å¡tampanje kontakta"
-
 #~ msgid "Copyright (C) 2000, Ximian, Inc."
 #~ msgstr "Autorsko pravo (C) 2000, Ximian, Inc."
-
 #~ msgid "This should test the contact print style editor widget"
 #~ msgstr "Ovo isprobava element ureÄ?ivaÄ?a stila za Å¡tampanje kontakta"
-
 #~ msgid "Contact Print Test"
 #~ msgstr "Proba Å¡tampe kontakta"
-
 #~ msgid "This should test the contact print code"
 #~ msgstr "Ovo isprobava kod za Å¡tampu kontakta"
-
 #~ msgid "Business"
 #~ msgstr "Poslovno"
-
 #~ msgid "Competition"
 #~ msgstr "TakmiÄ?enje"
-
 #~ msgid "Favourites"
 #~ msgstr "Omiljeno"
-
 #~ msgid "Gifts"
 #~ msgstr "Pokloni"
-
 #~ msgid "Goals/Objectives"
 #~ msgstr "Ciljevi/zadaci"
-
 #~ msgid "Holiday"
 #~ msgstr "Praznik"
-
 #~ msgid "Holiday Cards"
 #~ msgstr "Ä?estitke"
-
 #~ msgid "Hot Contacts"
 #~ msgstr "Važni kontakti"
-
 #~ msgid "Ideas"
 #~ msgstr "Ideje"
-
 #~ msgid "International"
 #~ msgstr "MeÄ?unarodno"
-
 #~ msgid "Key Customer"
 #~ msgstr "Važan klijent"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "Razno"
-
 #~ msgid "Next 7 days"
 #~ msgstr "SledeÄ?ih 7 dana"
-
 #~ msgid "Phone Calls"
 #~ msgstr "Telefonski pozivi"
-
 #~ msgid "Strategies"
 #~ msgstr "Strategije"
-
 #~ msgid "Suppliers"
 #~ msgstr "SnabdevaÄ?i"
-
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "PraÄ?enje u vremenu; izdaci"
-
 #~ msgid "VIP"
 #~ msgstr "VIP"
-
 #~ msgid "Waiting"
 #~ msgstr "Ä?ekam"
-
 #~ msgid "Next 7 Days"
 #~ msgstr "SledeÄ?ih 7 dana"
-
 #~ msgid "A_dd Filter Criteria"
 #~ msgstr "Do_daj kriterijum filtriranja"
-
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "Vreme: mestimiÄ?no oblaÄ?no"
-
 #~ msgid "Please enter user name first."
 #~ msgstr "Prvo unesite korisniÄ?ko ime."
-
 #~ msgid "Mark calendar offline"
 #~ msgstr "OznaÄ?i kalendar za rad van mreže"
-
 #~ msgid "Marks the selected calendar for offline viewing."
 #~ msgstr "OznaÄ?ava izabran kalendar za pregled van mreže."
-
 #~ msgid "Error opening the FAQ webpage."
 #~ msgstr "GreÅ¡ka pri otvaranju stranice za pomoÄ?."
-
 #~ msgid "Select Importers"
 #~ msgstr "Izaberite uvoznike"
-
 #~ msgid "Re_fresh..."
 #~ msgstr "O_sveži..."
-
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
 #~ msgid "Permission Denied."
 #~ msgstr "Zabranjen pristup."
-
 #~ msgid "_Properties..."
 #~ msgstr "Po_dešavanja..."
-
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Prikaz</b>"
-
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Podaci servera</b>"
-
 #~ msgid "_Categories..."
 #~ msgstr "Ka_tegorije..."
-
 #~ msgid "\n"
 #~ msgstr "\n"
-
 #~ msgid "Add an email to the List"
 #~ msgstr "Dodaj e-poštu na listu"
-
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Umetnite elektronske adrese iz imenika"
-
 #~ msgid "Members"
 #~ msgstr "Ä?lanovi"
-
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Ukloni elektronsku adresu sa liste"
-
 #~ msgid "_Select"
 #~ msgstr "_Izaberi"
-
 #~ msgid "D_escription:"
 #~ msgstr "_Opis:"
-
 #~ msgid "De_scription:"
 #~ msgstr "O_pis:"
-
 #~ msgid "Or_ganiser:"
 #~ msgstr "Or_ganizator:"
-
 #~ msgid "Task sort"
 #~ msgstr "Razvrstavanje zaduženja"
-
 #~ msgid "Memo sort"
 #~ msgstr "Razvrstavanje beleški"
-
 #~ msgid "Updating query"
 #~ msgstr "Osvežavanje upita"
-
 #~ msgid "Upcoming Appointments"
 #~ msgstr "NastupajuÄ?i sastanci"
-
 #~ msgid "SMTWTFS"
 #~ msgstr "NPUSÄ?PS"
-
 #~ msgid "Post To:"
 #~ msgstr "Slanje na:"
-
 #~ msgid "Unknown reason"
 #~ msgstr "Nepoznat razlog"
-
 #~ msgid "Open File"
 #~ msgstr "Otvara datoteku"
-
 #~ msgid "_Save Message"
 #~ msgstr "SaÄ?_uvaj poruku"
-
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "Poslovni i program za e-poÅ¡tu â?? Evolucija"
-
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "Nije moguÄ?e otvaranje datoteke &quot;{0}&quot;."
-
 #~ msgid "_Search name:"
 #~ msgstr "Osnova za _pretragu:"
-
 #~ msgid "Di_sable"
 #~ msgstr "I_skljuÄ?i"
-
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
-
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "ZvuÄ?na datoteka za obaveÅ¡tenje o novoj poÅ¡ti"
-
 #~ msgid "New Mail Notify type"
 #~ msgstr "Tip obaveštenja o novoj pošti"
-
 #~ msgid "Specifies the type of New Mail Notification the user wishes to use."
 #~ msgstr "Navodi tip obaveštenja o novoj pošti koje korisnik želi da koristi."
-
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">Oznake i boje</span>"
-
 #~ msgid "<span weight=\"bold\">New Mail Notification</span>"
 #~ msgstr "<span weight=\"bold\">Obaveštavanje o novoj pošti</span>"
-
 #~ msgid "Attach original message"
 #~ msgstr "Priloži originalnu poruku"
-
 #~ msgid "Do not quote original message"
 #~ msgstr "Ne citiraj originalnu poruku"
-
 #~ msgid "HTML Mail"
 #~ msgstr "HTML pošta"
-
 #~ msgid "Quote original message"
 #~ msgstr "Citiraj originalnu poruku"
-
 #~ msgid "Se_lect..."
 #~ msgstr "Iza_beri..."
-
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "S_virni kada stigne nova pošta"
-
 #~ msgid "_Do not notify me when new mail arrives"
 #~ msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
-
 #~ msgid "Enter a name for this signature."
 #~ msgstr "Unesite ime za ovaj potpis."
-
 #~ msgid "Name:"
 #~ msgstr "Ime:"
-
 #~ msgid ""
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "Sigurno želite trajno da uklonite sve obrisane poruke u fascikli &quot;{0}"
 #~ "&quot;?"
-
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "Obrisati &quot;{0}&quot;?"
-
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Da li želite da ovu radnju takoÄ?e primenite na sve podfascikle?"
-
 # bug: requires a comment on usage
 #~ msgid "Only on _Current Folder"
 #~ msgstr "Samo na _tekuÄ?oj fascikli"
-
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "UkljuÄ?uje dodatak za podsetnik za priloge"
-
 #~ msgid "Attachment Reminder Preferences"
 #~ msgstr "Svojstva podsetnika za priloge"
-
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Podseti za _nedostajuÄ?e priloge"
-
 #~ msgid "_Refresh:"
 #~ msgstr "O_sveži:"
-
 # Nejasno. "Ä?emu ovo služi, a uz to i ne radi?".
 # http://bugzilla.gnome.org/show_bug.cgi?id=458512
 #, fuzzy
 #~ msgid "button-user"
 #~ msgstr "dugme-korisnik"
-
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "Izaberite (48*48) png veliÄ?ine < 720bajta"
-
 #~ msgid "_Contacts..."
 #~ msgstr "_Kontakti..."
-
 #~ msgid "Every time a new mail arrives, pop up a libnotify notification."
 #~ msgstr ""
 #~ "Svaki put kada stigne nova poÅ¡ta, prikaži prozorÄ?e sa libnotify "
 #~ "obaveštenjem."
-
 #~ msgid "Make the status icon blink"
 #~ msgstr "Ä?ini da ikona statusa trepÄ?e"
-
 #~ msgid "When the new-mail status icon is visible, make it blink."
 #~ msgstr "Kada je ikona za novu poÅ¡tu vidljiva, neka trepÄ?e."
-
 #~ msgid "System error: %s"
 #~ msgstr "Sistemska greška: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Nalog ne može da šalje poštu"
-
 #~ msgid "No store available"
 #~ msgstr "Nema dostupne ostave"
-
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
 #~ msgstr "Dodatak koji uvodi CORBA suÄ?elje za mrežno pristupanje poÅ¡ti."
-
 #~ msgid "Mail Remote"
 #~ msgstr "Mrežna pošta"
-
 #~ msgid "New Mail Notification"
 #~ msgstr "Obaveštenje o novoj pošti"
-
 #~ msgid "Configure"
 #~ msgstr "Podešava"
-
 #~ msgid "Gives an option to print mail from composer"
 #~ msgstr "Daje moguÄ?nost Å¡tampe poruke iz sastavljaÄ?a"
-
 #~ msgid "Print Message"
 #~ msgstr "Å tampaj poruku"
-
 #~ msgid "Prints the message"
 #~ msgstr "Å tampa poruku"
-
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "Dodatak koji rukuje uvodnim Ä?arobnjakom"
-
 #~ msgid "Startup wizard"
 #~ msgstr "Ä?arobnjak za poÄ?etak"
-
 #~ msgid "A string description of the current printer settings"
 #~ msgstr "Opisni niz trenutnih podeÅ¡avanja Å¡tampaÄ?a"
-
 #~ msgid "No folder name specified."
 #~ msgstr "Nije navedeno ime fascikle."
-
 #~ msgid "Folder name cannot contain the Return character."
 #~ msgstr "Ime fascikle ne može da sadrži Return znak."
-
 #~ msgid "Folder name cannot contain the character \"/\"."
 #~ msgstr "Ime fascikle ne može da sadrži znak â??/â??."
-
 #~ msgid "Folder name cannot contain the character \"#\"."
 #~ msgstr "Ime fascikle ne može da sadrži znak â??#â??."
-
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr "â??.â?? i â??..â?? su zauzeti za imena fascikli."
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Umnoži izabrano u spisak iseÄ?aka"
-
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "SeÄ?e izabrano u spisak iseÄ?aka"
-
 #~ msgid "Paste from clipboard"
 #~ msgstr "Ubaci sa spiska iseÄ?aka"
-
 #~ msgid "All Day Event"
 #~ msgstr "Celodnevni dogaÄ?aj"
-
 #~ msgid "Send _Options"
 #~ msgstr "_Opcije slanja"
-
 #~ msgid "Download messages for offline"
 #~ msgstr "Preuzima poruke za rad van mreže"
-
 #~ msgid "Show messages in the normal style"
 #~ msgstr "Prikaži poruku u normalnom stilu"
-
 #~ msgid "Delete all but signature"
 #~ msgstr "Briše sve osim potpisa"
-
 #~ msgid "For_mat"
 #~ msgstr "_Oblik"
-
 #~ msgid "HT_ML"
 #~ msgstr "HT_ML"
-
 #~ msgid "Open a file"
 #~ msgstr "Otvori datoteku"
-
 #~ msgid "PGP Encrypt"
 #~ msgstr "PGP Å¡ifruj"
-
 #~ msgid "PGP Sign"
 #~ msgstr "PGP potpis"
-
 #~ msgid "S/MIME Encrypt"
 #~ msgstr "S/MIME Å¡ifruj"
-
 #~ msgid "S/MIME Sign"
 #~ msgstr "S/MIME potpis"
-
 #~ msgid "Save in folder..."
 #~ msgstr "SaÄ?uvaj u fasciklu..."
-
 #~ msgid "Save the message in a specified folder"
 #~ msgstr "SaÄ?uvaj poruku u navedenoj fascikli"
-
 #~ msgid "Send"
 #~ msgstr "Pošalji"
-
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Pošalji poruku u HTML formatu"
-
 #~ msgid "_Delete all"
 #~ msgstr "Obri_Å¡i sve"
-
 #~ msgid "_Open..."
 #~ msgstr "_Otvori..."
-
 #~ msgid "C_lose"
 #~ msgstr "_Zatvori"
-
 #~ msgid "H_TML"
 #~ msgstr "H_TML"
-
 #~ msgid "Save and _Close"
 #~ msgstr "SaÄ?uvaj i _zatvori"
-
 #~ msgid "Save the current file and close the window"
 #~ msgstr "SaÄ?uvaj tekuÄ?u datoteku i zatvori prozor"
-
 #~ msgid "Refresh List"
 #~ msgstr "Osveži spisak"
-
 #~ msgid "Refresh List of Folders"
 #~ msgstr "Osveži spisak fascikli"
-
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Ukloni fasciklu sa spiska prijavljenih fascikli"
-
 #~ msgid "Subscribe"
 #~ msgstr "Prijavi se"
-
 #~ msgid "Unsubscribe"
 #~ msgstr "Odjavi se"
-
 #~ msgid "_Invert Selection"
 #~ msgstr "_Obrni izbor"
-
 #~ msgid "Status Details"
 #~ msgstr "Detalji stanja"
-
 #~ msgid "Time Zone"
 #~ msgstr "Vremenska zona"
-
 #~ msgid "TimeZone Combobox"
 #~ msgstr "Okvir za vremensku zonu"
 
-# week, 'M' for 'Monday', 'T' for Tuesday etc.
-#~ msgid "MTWTFSS"
-#~ msgstr "PUSÄ?PSN"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- _Ukloni"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "Pri_kaži ova polja redom:"
-
-#~ msgid "_Add ->"
-#~ msgstr "_Dodaj ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "OponaÅ¡aj promenu veliÄ?ine oznake"
-
-#~ msgid "A Folder with this name already exists"
-#~ msgstr "Jedna fascikla sa tim imenom veÄ? postoji"
-
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "Promenjena elektronska adresa ili ime ovog kontakta\n"
-#~ "veÄ? postoji u ovoj fascikli.  Želite li ipak da dodate?"
-
-#~ msgid ""
-#~ "All information in these journal entries will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "Svi podaci u ovim unosima u dnevnik Ä?e biti obrisani i neÄ?e se moÄ?i "
-#~ "povratiti."
-
-#~ msgid ""
-#~ "All information on this journal entry will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "Svi podaci o ovom unosu u dnevnik Ä?e biti obrisani i neÄ?e se moÄ?i "
-#~ "povratiti."
-
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "Sigurno želite da obriÅ¡ete unos u dnevnik â??{0}â???"
-
-# bug: plural-forms
-#~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "Sigurno želite da obrišete ove {0} unose u dnevnik?"
-
-#~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "Sigurno želite da obrišete ovaj unos u dnevnik?"
-
-#~ msgid ""
-#~ "If you do not send a cancelation notice, the other participants may not "
-#~ "know the journal has been deleted."
-#~ msgstr ""
-#~ "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici možda neÄ?e "
-#~ "znati da je dnevnik obrisan."
-
-#~ msgid "This journal entry has been deleted."
-#~ msgstr "Ovaj unos u dnevnik je obrisan."
-
-#~ msgid "This journal entry has been changed."
-#~ msgstr "Ovaj unos u dnevnik je promenjen."
-
-#~ msgid "The journal entry could not be deleted due to a corba error"
-#~ msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
-
-#~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr "Unos u dnevnik nije mogao biti obrisan jer pristup nije dozvoljen"
-
-#~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr "Unos u dnevnik nije mogao biti obrisan usled greške"
-
-# povratni > redovni
-#~ msgid ""
-#~ "You are modifying a recurring journal entry. What would you like to "
-#~ "modify?"
-#~ msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
-
-#~ msgid "<b>Then</b>"
-#~ msgstr "<b>Onda</b>"
-
-#~ msgid "Valid signature, cannot verify sender"
-#~ msgstr "Ispravan potpis, nije moguÄ?a provera poÅ¡iljaoca"
-
-#~ msgid "Mark as _Read"
-#~ msgstr "O_znaÄ?i kao proÄ?itano"
-
-#~ msgid "_Do not Mark as Read"
-#~ msgstr "Os_tavi neproÄ?itano"
-
-#~ msgid "Check Evolution archive"
-#~ msgstr "Proverava arhivu Evolucije"
-
-#~ msgid "<b>Junk Mail Settings</b>"
-#~ msgstr "<b>PodeÅ¡avanja poÅ¡te za Ä?ubre</b>"
-
-#~ msgid "<b>Subject</b> :"
-#~ msgstr "<b>Naslov</b>"
-
-#~ msgid "<b>From</b> :"
-#~ msgstr "<b>Å alje</b>"
-
-#~ msgid "Unable to find this journal entry in any journal"
-#~ msgstr "Ne mogu da pronaÄ?em ovaj unos u nijednom dnevniku"
-
-#~ msgid "_Address: "
-#~ msgstr "_Adresa:"
-
-#~ msgid "Print cards"
-#~ msgstr "Å tampaj karte"
-
-#~ msgid "Organization"
-#~ msgstr "Organizacija"
-
-#~ msgid "E-mail"
-#~ msgstr "E-pošta"
-
-#~ msgid "GTK Tree View"
-#~ msgstr "Pregled GTK stabla"
-
-#~ msgid "Print envelope"
-#~ msgstr "Å tampaj kovertu"
-
-#~ msgid "Print contacts"
-#~ msgstr "Å tampaj kontakte"
-
-#~ msgid "Print contact"
-#~ msgstr "Å tampaj kontakt"
-
-#~ msgid "Error loading default addressbook."
-#~ msgstr "GreÅ¡ka pri uÄ?itavanju podrazumevanog imenika."
-
-#~ msgid "Input File"
-#~ msgstr "Ulazna datoteka"
-
-#~ msgid "Add Calendar"
-#~ msgstr "Dodaje kalendar"
-
-#~ msgid "Add Task List"
-#~ msgstr "Dodaje listu zaduženja"
-
-#~ msgid "_Add Calendar"
-#~ msgstr "_Dodaj kalendar"
-
-#~ msgid "_Add Task List"
-#~ msgstr "_Dodaj listu zaduženja"
-
-#~ msgid "Add New Calendar"
-#~ msgstr "Dodaj novi kalendar"
-
-#~ msgid "Calendar Group"
-#~ msgstr "Grupa kalendara"
-
-#~ msgid "Calendar Location"
-#~ msgstr "Mesto kalendara"
-
-#~ msgid "Calendar Name"
-#~ msgstr "Ime kalendara"
-
-#~ msgid "<b>Task List Options</b>"
-#~ msgstr "<b>Opcije liste zaduženja</b>"
-
-#~ msgid "Add New Task List"
-#~ msgstr "Dodaj novu listu zaduženja"
-
-#~ msgid "Task List Group"
-#~ msgstr "Grupa za liste zaduženja"
-
-#~ msgid "Task List Name"
-#~ msgstr "Ime liste zaduženja"
-
-#~ msgid "<b>Free/Busy C_alendars</b>"
-#~ msgstr "<b>K_alendari za slobodno/zauzeto</b>"
-
-#~ msgid "<b>Publishing Frequency</b>"
-#~ msgstr "<b>UÄ?estalost objavljivanja</b>"
-
-#~ msgid "<b>Publishing _Location</b>"
-#~ msgstr "<b>_Mesto objavljivanja</b>"
-
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "Podešavanja objavljivanja slobodno/zauzeto"
-
-#~ msgid "_Daily"
-#~ msgstr "_Dnevno"
-
-#~ msgid "_Manual"
-#~ msgstr "_RuÄ?no"
-
-#~ msgid "_Weekly"
-#~ msgstr "_Nedeljno"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "Unesite lozinku za %s"
-
-#~ msgid "Selected day (%a %b %d %Y)"
-#~ msgstr "Izabrani dan (%a, %d. %b %Y.)"
-
-#~ msgid "%a %b %d"
-#~ msgstr "%a, %d. %b"
-
-#~ msgid "%a %d %Y"
-#~ msgstr "%a, %d. %Y."
-
-#~ msgid "%a %b %d %Y"
-#~ msgstr "%a, %d. %b %Y."
-
-#~ msgid "Selected week (%s - %s)"
-#~ msgstr "Izabrana nedelja (%s - %s)"
-
-#~ msgid "Selected month (%b %Y)"
-#~ msgstr "Izabrani mesec (%b %Y)"
-
-#~ msgid "Selected year (%Y)"
-#~ msgstr "Izabrana godina (%Y)"
-
-#~ msgid "Print Item"
-#~ msgstr "Å tampaj predmet"
-
-#~ msgid "%.0fK"
-#~ msgstr "%.0fK"
-
-#~ msgid "%.0fM"
-#~ msgstr "%.0fM"
-
-#~ msgid "%.0fG"
-#~ msgstr "%.0fG"
-
-#~ msgid "No, Do not Change Status"
-#~ msgstr "Ne, ne menjaj stanje"
-
-#~ msgid "<b>Receiving Email</b>"
-#~ msgstr "<b>Primanje pošte</b>"
-
-#~ msgid "<b>Sending Email:</b>"
-#~ msgstr "<b>Slanje pošte:</b>"
-
-#~ msgid ""
-#~ "<small>This page allows you to choose if you want to be notified via a "
-#~ "read receipt when a message you\n"
-#~ "sent is read, and to specify what Evolution should do when someone "
-#~ "requests a receipt from you.</small>"
-#~ msgstr ""
-#~ "<small>Ova strana dozvoljava da izaberete da li želite da pošaljete "
-#~ "priznanicu uz svoju\n"
-#~ "poruku radi obaveÅ¡tenja kada bude proÄ?itana, i da odredite Å¡ta Evolucija "
-#~ "da radi kada neko Vama pošalje priznanicu.</small>"
-
-#~ msgid "Ask me if I want to send back a read receipt"
-#~ msgstr "Pitaj me želim li da vratim priznanicu"
-
-#~ msgid "Never send back a read receipt"
-#~ msgstr "Nikada ne vraÄ?aj priznanicu"
-
-#~ msgid "Read Receipts"
-#~ msgstr "Priznanice"
-
-#~ msgid "Request a read receipt for all messages I send"
-#~ msgstr "Zatraži povraÄ?aj priznanice za sve poruke koje poÅ¡aljem"
-
-#~ msgid ""
-#~ "Unless the message is sent to a mailing list, and not to me personally"
-#~ msgstr "Osim ako je poruka poslata dopisnoj listi, a ne meni liÄ?no"
-
-#~ msgid ""
-#~ "When you receive an email with a read receipt request, what should "
-#~ "Evolution do?"
-#~ msgstr "Kada primite poruku sa priznanicom, Å¡ta Evolucija da radi?"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Položaj zone."
-
-#~ msgid "Enable"
-#~ msgstr "OmoguÄ?i"
-
-#~ msgid "Priority Filter \"%s\""
-#~ msgstr "Filter važnosti â??%sâ??"
-
-#~ msgid ""
-#~ "Some of your Netscape email filters are based on\n"
-#~ "email priorities, which are not used in Evolution.\n"
-#~ "Instead, Evolution provides scores in the range of\n"
-#~ "-3 to 3 that can be assigned to emails and filtered\n"
-#~ "accordingly.\n"
-#~ "\n"
-#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
-#~ "was added that converts Netscape's email priorities into\n"
-#~ "Evolution's scores, and the affected filters use scores instead\n"
-#~ "of priorities. Check the imported filters to make sure\n"
-#~ "everything still works as intended."
-#~ msgstr ""
-#~ "Neki od Netscape filtera za poštu zasnovani su\n"
-#~ "na prioritetima koje Evolucija ne koristi.\n"
-#~ "Umesto toga Evolucija daje rezultate u rasponu od\n"
-#~ "-3 do 3 koji se dodeljuju porukama i u skladu sa time\n"
-#~ "filtriraju.\n"
-#~ "\n"
-#~ "Kao privremeno rešenje, dodata je grupa filtera imena \n"
-#~ "â??Prioritetni filterâ?? koja pretvara Netscape filtere za poÅ¡tu u\n"
-#~ "rezultate Evolucije, a promenjeni filteri koriste rezultate umesto\n"
-#~ "prioriteta. Proverite uvežene filtere da se uverite\n"
-#~ "da li sve radi kao Å¡to bi trebalo."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters use\n"
-#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
-#~ "feature, which is not supported in Evolution.\n"
-#~ "These filters will be dropped."
-#~ msgstr ""
-#~ "Neki od Netscape filtera za poštu koriste\n"
-#~ "moguÄ?nost â??Zanemari raspravuâ?? ili â??Prati raspravuâ??\n"
-#~ "koju Evolucija ne podržava.\n"
-#~ "Ovi filteri Ä?e biti izostavljeni."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters test the\n"
-#~ "body of emails for (in)equality to a given string,\n"
-#~ "which is not supported in Evolution. Those filters\n"
-#~ "were modified to test whether that string is or is not\n"
-#~ "contained in the message body."
-#~ msgstr ""
-#~ "Neki od Netscape filtera za poštu proveravaju\n"
-#~ "da li u telu poruka postoji (ne)jednakost za dati niz,\n"
-#~ "što Evolucija ne podržava. Ovi filteri\n"
-#~ "su promenjeni da proveravaju da li taj niz jeste\n"
-#~ "ili nije sadržan u telu poruke."
-
-#~ msgid "Evolution is importing your old Netscape data"
-#~ msgstr "Evolucija uvozi stare Netscape podatke"
-
-#~ msgid "Importing Netscape data"
-#~ msgstr "Uvoženje Netscape podataka"
-
-#~ msgid "Settings"
-#~ msgstr "Podešavanja"
-
-#~ msgid "Mail Filters"
-#~ msgstr "Filteri pošte"
-
-#~ msgid ""
-#~ "Evolution has found Netscape mail files.\n"
-#~ "Would you like them to be imported into Evolution?"
-#~ msgstr ""
-#~ "Evolucija je pronašla Netscape datoteke pošte.\n"
-#~ "Želite li da budu uvežene u Evoluciju?"
-
-#~ msgid "<span weight=\"bold\">Filter Options</span>"
-#~ msgstr "<span weight=\"bold\">MoguÄ?nosti filtera</span>"
-
-#~ msgid "<b>Recipients </b>"
-#~ msgstr "<b>Primaoci</b>"
-
-#~ msgid "<b>Action</b>"
-#~ msgstr "<b>Radnja</b>"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Datum i vreme</b>"
-
-#~ msgid ""
-#~ "The output directory was not found on iPod! Please ensure that iPod has "
-#~ "been correctly set up and try again."
-#~ msgstr ""
-#~ "Izlazna fascikla nije pronaÄ?ena na iPod ureÄ?aju! Molim proverite da li je "
-#~ "džepni ureÄ?aj pravilno podeÅ¡en i pokuÅ¡ajte ponovo."
-
-#~ msgid "Could not export data!"
-#~ msgstr "Nije moguÄ? izvoz podataka!"
-
-#~ msgid "Exporting data failed."
-#~ msgstr "Neuspešan izvoz podataka."
-
-#~ msgid "Could not open addressbook!"
-#~ msgstr "Nije moguÄ?e otvoriti imenik!"
-
-#~ msgid "Could not open the Evolution addressbook to export data."
-#~ msgstr "Ne mogu da otvorim Evolucijin imenik kako bi izvezao podatke."
-
-#~ msgid "Could not open calendar/todo!"
-#~ msgstr "Ne mogu otvoriti kalendar/spisak obaveza"
-
-#~ msgid "Could not open the Evolution calendar/todo list to export data."
-#~ msgstr ""
-#~ "Ne mogu otvoriti Evolucijin kalendar/spisak za uraditi da bi izvezao "
-#~ "podatke."
-
-#~ msgid "New mail notify"
-#~ msgstr "Obaveštenje o novoj pošti"
-
-#~ msgid "(Untitled)"
-#~ msgstr "(Neimenovano)"
-
-#~ msgid "An attachment to add."
-#~ msgstr "Prilog za dodavanje."
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "Tip sadržaja priloga."
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "Ime datoteke koje se prikazuje u poruci."
-
-#~ msgid "Description of the attachment."
-#~ msgstr "Opis priloga."
-
-#~ msgid "Mark attachment to be shown inline by default."
-#~ msgstr "OznaÄ?i da se prilog podrazumevano prikazuje unutar poruke."
-
-#~ msgid "_Edit..."
-#~ msgstr "_Uredi..."
-
-#~ msgid "..."
-#~ msgstr "..."



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