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

From: Miloš Popović <mpopovic src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution/gnome-2-28] Updated Serbian translation
Date: Tue, 1 Sep 2009 13:00:26 +0000 (UTC)
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]