[evolution] Updated Serbian translation



commit 1130c2b2e740ed2ff7968919cd0fe77bb34c7bb0
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Mon Feb 20 10:47:05 2012 +0100

    Updated Serbian translation

 po/sr.po       | 1132 ++++++++++++++++++++++++++++++++------------------------
 po/sr latin po | 1132 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 1278 insertions(+), 986 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index d501785..d40db29 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,18 +1,18 @@
 # Serbian translation of evolution
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003â2012.
 # This file is distributed under the same license as the evolution package.
 # Maintainer: ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>
 # ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>, 2010.
 # ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
-#: ../shell/main.c:567
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
 "ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-02-14 14:48+0000\n"
-"PO-Revision-Date: 2012-02-15 10:23+0200\n"
+"POT-Creation-Date: 2012-02-19 02:09+0000\n"
+"PO-Revision-Date: 2012-02-19 14:19+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -294,6 +294,7 @@ msgstr "_ÐÐÐ:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Ca_tegories..."
 msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ..."
 
@@ -438,7 +439,7 @@ msgstr "_ÐÐÐÐÑÑÐÑÐ:"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-display.c:719
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:83
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "_ÐÐÑÐÐÐÐÐ:"
@@ -1446,28 +1447,34 @@ msgid "Importing..."
 msgstr "ÐÐÐÐÐÐ..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:1075
-msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "ÐÑÑÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
+#| msgid "Outlook CSV or Tab (.csv, .tab)"
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
+msgstr "ÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1076
-msgid "Outlook CSV and Tab Importer"
-msgstr "ÐÑÑÐÑÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook Contacts CSV and Tab Importer"
+msgstr "ÐÑÑÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÐÑÐ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1084
-msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "ÐÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
+#| msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
+msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1085
-msgid "Mozilla CSV and Tab Importer"
-msgstr "ÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
+#| msgid "Mozilla CSV and Tab Importer"
+msgid "Mozilla Contacts CSV and Tab Importer"
+msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÐÑÐ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1093
-msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
+#| msgid "Evolution CSV or Tab (.csv, .tab)"
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1094
-msgid "Evolution CSV and Tab Importer"
-msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
+#| msgid "Evolution CSV and Tab Importer"
+msgid "Evolution Contacts CSV and Tab Importer"
+msgstr "ÐÐÐÐÑÑÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÐÑÐ"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -1475,7 +1482,7 @@ msgstr "ÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (.ldif)"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
@@ -2605,101 +2612,101 @@ msgstr "%s  ÐÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐ. ÐÐ ÐÐÐÐÐÐÑÐÐ ÑÐ 
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐ, ÐÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÐÐÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:276
+#: ../calendar/gui/dialogs/comp-editor.c:275
 msgid "Could not save attachments"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:749
 msgid "Edit Appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:757
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Meeting - %s"
 msgstr "ÐÐÑÑÐÐÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Appointment - %s"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Task - %s"
 msgstr "ÐÐÐÐÑÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Memo - %s"
 msgstr "ÐÐÐÐÑÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "No Summary"
 msgstr "ÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:909
+#: ../calendar/gui/dialogs/comp-editor.c:908
 msgid "Keep original item?"
 msgstr "ÐÐÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐÐÑ ÑÑÐÐÐÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Close the current window"
 msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129 ../mail/e-mail-browser.c:137
+#: ../calendar/gui/dialogs/comp-editor.c:1128 ../mail/e-mail-browser.c:137
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:144
+#: ../calendar/gui/dialogs/comp-editor.c:1135 ../mail/e-mail-browser.c:144
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "View help"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157 ../mail/e-mail-browser.c:151
+#: ../calendar/gui/dialogs/comp-editor.c:1156 ../mail/e-mail-browser.c:151
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "ÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "Save current changes"
 msgstr "ÐÐÑÑÐÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:158
+#: ../calendar/gui/dialogs/comp-editor.c:1184 ../mail/e-mail-browser.c:158
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÑÐÐÑÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1191
 msgid "_Classification"
 msgstr "ÐÐÐÐ_ÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:172
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -2708,137 +2715,132 @@ msgstr "ÐÐÐÐ_ÐÐ"
 msgid "_Edit"
 msgstr "_ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206 ../mail/e-mail-browser.c:165
+#: ../calendar/gui/dialogs/comp-editor.c:1205 ../mail/e-mail-browser.c:165
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ÐÐÑÐ_ÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 #: ../shell/e-shell-window-actions.c:1628
 msgid "_Help"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1219
 msgid "_Insert"
 msgstr "_ÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227
+#: ../calendar/gui/dialogs/comp-editor.c:1226
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_ÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
+#: ../calendar/gui/dialogs/comp-editor.c:1233 ../mail/e-mail-browser.c:179
 #: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_ÐÑÐÐÐÐ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1245
 #: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1253
 msgid "_Categories"
 msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1255
 msgid "Toggles whether to display categories"
 msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Time _Zone"
 msgstr "ÐÑÐÐÐÐÑÐÐ _ÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1263
 msgid "Toggles whether the time zone is displayed"
 msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Pu_blic"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "Classify as public"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "_Private"
 msgstr "Ð_ÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1281
 msgid "Classify as private"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "_Confidential"
 msgstr "ÐÐÐÐ_ÑÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Classify as confidential"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1297
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "R_ole Field"
 msgstr "ÐÐÑÐ _ÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether the Role field is displayed"
 msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "_RSVP"
 msgstr "_ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1307
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "_Status Field"
 msgstr "ÐÐÑÐ _ÑÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Toggles whether the Status field is displayed"
 msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1320
 msgid "_Type Field"
 msgstr "ÐÐÑÐ _ÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "ÐÐÐÑÐÑÑÐ _ÐÐÐÑÐÐÐÑÐ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../calendar/gui/dialogs/comp-editor.c:2044
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:2590
-#: ../calendar/gui/dialogs/comp-editor.c:3582
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2553
+#: ../calendar/gui/dialogs/comp-editor.c:3545
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑ ÑÑÐÐÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÐ ÐÑÐÐ ÐÐÑÑÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3546
+#: ../calendar/gui/dialogs/comp-editor.c:3509
 #: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "ÐÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3614
+#: ../calendar/gui/dialogs/comp-editor.c:3577
 msgid "Unable to use current version!"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐ!"
 
@@ -2851,15 +2853,15 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÑÐ: %s"
 msgid "Could not open destination"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÐÑÑÐ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:126
 msgid "Destination is read only"
 msgstr "ÐÐÑÐÐÐÑÑÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:160
 msgid "Cannot create object"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:189
 msgid "Could not open source"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑ"
 
@@ -3032,7 +3034,6 @@ msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐÐ ÐÐÐÑÐÑÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
 msgid "Or_ganizer:"
 msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑ:"
 
@@ -3310,6 +3311,12 @@ msgstr "ÐÑÐÐÐ"
 msgid "_List:"
 msgstr "_ÐÐÐÑÐÐ:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Organi_zer:"
+msgstr "ÐÑÐÐÐÐ_ÐÐÑÐÑ:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_ÐÑÐÐÐ:"
@@ -3759,11 +3766,6 @@ msgstr ""
 "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÐÐÑÐ, ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ "
 "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/task-page.c:350
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Organi_zer:"
-msgstr "ÐÑÐÐÐÐ_ÐÐÑÐÑ:"
-
 #: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "ÐÑÐÑÑÐ ÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
@@ -3777,10 +3779,6 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ : %s"
 msgid "D_ue date:"
 msgstr "ÐÑÐ_ÑÑÐ ÑÐÐ:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Categor_ies..."
-msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ:"
@@ -3900,7 +3898,7 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1838
+#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1839
 #: ../calendar/gui/e-day-view-top-item.c:852
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
@@ -3936,7 +3934,7 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1854
+#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1855
 #: ../calendar/gui/e-day-view-top-item.c:856
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -4334,14 +4332,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
 #: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
 #: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
 msgid "am"
 msgstr "ÐÑÐ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
 #: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
 #: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
 msgid "pm"
@@ -4358,13 +4356,13 @@ 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.c:1821 ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1822 ../calendar/gui/e-day-view-top-item.c:848
 #: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2638
+#: ../calendar/gui/e-day-view.c:2639
 #, c-format
 msgid "Week %d"
 msgstr "%d ÐÐÐÐÑÐ"
@@ -6802,38 +6800,38 @@ msgid "Pacific/Yap"
 msgstr "ÐÐÑÐÑÐÐ/ÐÐÐ"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
+#: ../capplet/anjal-settings-main.c:161
 msgid "ID of the socket to embed in"
 msgstr "ÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:162
 msgid "socket"
 msgstr "ÐÑÐÐÑÑÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ ÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ."
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "ÐÐÐÑÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÑ."
 
-#: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5363 ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:282
+#: ../mail/em-account-editor.c:5395 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:374
-#: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:5234 ../mail/em-account-editor.c:5291
+#: ../capplet/settings/mail-account-view.c:376
+#: ../capplet/settings/mail-account-view.c:421
+#: ../mail/em-account-editor.c:5266 ../mail/em-account-editor.c:5323
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6841,55 +6839,69 @@ msgstr "ÐÐÐÐÐÐ"
 msgid "Google"
 msgstr "ÐÑÐÐ"
 
+#: ../capplet/settings/mail-account-view.c:498
+#: ../capplet/settings/mail-account-view.c:602
+#: ../mail/em-account-editor.c:4799 ../mail/em-account-editor.c:4834
+msgid "Always (SSL)"
+msgstr "ÐÐÐÐ (ÐÐÐ)"
+
+#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:605
+#: ../mail/em-account-editor.c:4802 ../mail/em-account-editor.c:4837
+msgid "When possible (TLS)"
+msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑÑÐ (ÐÐÐ)"
+
+#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4805
+#: ../mail/em-account-editor.c:4840
+msgid "Never"
+msgstr "ÐÐÐÐÐÐ"
+
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../capplet/settings/mail-account-view.c:486
+#: ../capplet/settings/mail-account-view.c:512
 msgid "Personal details:"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:179
+#: ../capplet/settings/mail-account-view.c:519 ../mail/mail-config.ui.h:180
 msgid "Name:"
 msgstr "ÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:180
+#: ../capplet/settings/mail-account-view.c:528 ../mail/mail-config.ui.h:181
 msgid "Email address:"
 msgstr "ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:181
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:182
 msgid "Details:"
 msgstr "ÐÐÑÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:182
+#: ../capplet/settings/mail-account-view.c:546 ../mail/mail-config.ui.h:183
 msgid "Receiving"
 msgstr "ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:184
+#: ../capplet/settings/mail-account-view.c:553 ../mail/mail-config.ui.h:185
 msgid "Server type:"
 msgstr "ÐÐÐ ÑÐÑÐÐÑÐ: "
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:185
+#: ../capplet/settings/mail-account-view.c:562 ../mail/mail-config.ui.h:186
 msgid "Server address:"
 msgstr "ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:186
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:187
 msgid "Username:"
 msgstr "ÐÐÑÐÑÐÐÑÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:554
+#: ../capplet/settings/mail-account-view.c:580
 msgid "Use encryption:"
 msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:559
-#: ../capplet/settings/mail-account-view.c:594
-msgid "never"
-msgstr "ÐÐÐÐÐÐ"
-
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:183
+#: ../capplet/settings/mail-account-view.c:613 ../mail/mail-config.ui.h:184
 msgid "Sending"
 msgstr "ÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:656
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -6899,7 +6911,7 @@ msgstr ""
 "Ð-ÐÐÑÑÐ Ð ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ. ÐÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÑÐ "
 "ÐÑÑÐÐÐÑÑÐÐ, ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÐ Ð ÑÐÑÐÐÑÑ."
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:658
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -6909,11 +6921,11 @@ msgstr ""
 "ÐÐÐÑÑÐÐÐ ÑÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÑÑÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ, ÐÐÐ ÐÐÐÐÐ "
 "ÑÐ ÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐ ÐÑ ÐÐÐÐÐÐÑÐ."
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:660
 msgid "You can specify more options to configure the account."
 msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:662
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -6921,11 +6933,11 @@ msgstr ""
 "ÐÐÐÐ ÑÑ ÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐÑÑÐ. ÐÐÐÑÑÐÐÐ ÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐ "
 "ÐÐÑÑÐÐÐÐ, ÐÐÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐ."
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:663
 msgid "You can specify your default settings for your account."
 msgstr "ÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:664
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -6933,103 +6945,103 @@ msgstr ""
 "ÐÑÐÐÐ ÑÐ ÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÐÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÐÐ "
 "ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑ ÐÐÑÑÑ."
 
-#: ../capplet/settings/mail-account-view.c:636
-#: ../mail/em-account-editor.c:2924 ../mail/em-account-editor.c:3060
+#: ../capplet/settings/mail-account-view.c:679
+#: ../mail/em-account-editor.c:2924 ../mail/em-account-editor.c:3063
 msgid "Identity"
 msgstr "ÐÐÐÐÑÐÑÐÑ"
 
-#: ../capplet/settings/mail-account-view.c:636
+#: ../capplet/settings/mail-account-view.c:679
 msgid "Next - Receiving mail"
 msgstr "ÐÐÐÑÐÐ â ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Receiving mail"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Next - Sending mail"
 msgstr "ÐÐÐÑÐÐ â ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Back - Identity"
 msgstr "ÐÐÐÐÐ â ÐÐÐÐÑÐÑÐÑ"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Next - Receiving options"
 msgstr "ÐÐÐÑÐÐ â ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Receiving options"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving mail"
 msgstr "ÐÐÐÐÐ â ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Sending mail"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Next - Review account"
 msgstr "ÐÐÐÑÐÐ â ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Next - Defaults"
 msgstr "ÐÐÐÑÐÐ â ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving options"
 msgstr "ÐÐÐÐÐ â ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:4044
+#: ../capplet/settings/mail-account-view.c:684
+#: ../mail/em-account-editor.c:4076
 msgid "Defaults"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Back - Sending mail"
 msgstr "ÐÐÐÐÐ â ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Review account"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Finish"
 msgstr "ÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Back - Sending"
 msgstr "ÐÐÐÐÐ â ÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:856
 msgid "Setup Google contacts with Evolution"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:857
 msgid "Setup Google calendar with Evolution"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4862
+#: ../capplet/settings/mail-account-view.c:862
+#: ../mail/em-account-editor.c:4894
 msgid "You may need to enable IMAP access."
 msgstr "ÐÐÐÐÐ ÑÐÑÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÑÑÐ."
 
-#: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4839
+#: ../capplet/settings/mail-account-view.c:870
+#: ../mail/em-account-editor.c:4871
 msgid "Google account settings:"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:806
+#: ../capplet/settings/mail-account-view.c:896
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4909
+#: ../capplet/settings/mail-account-view.c:900
+#: ../mail/em-account-editor.c:4941
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7039,25 +7051,25 @@ msgstr ""
 "ÑÐÑÐÐÑÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐ. ÐÐÑÐÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ ÐÑÑÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÐ "
 "ÐÑÐÑÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4894
+#: ../capplet/settings/mail-account-view.c:909
+#: ../mail/em-account-editor.c:4926
 msgid "Yahoo account settings:"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:833
+#: ../capplet/settings/mail-account-view.c:923
 msgid "Yahoo Calendar name:"
 msgstr "ÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:1020
+#: ../capplet/settings/mail-account-view.c:1116
 msgid "Password:"
 msgstr "ÐÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:1072
+#: ../capplet/settings/mail-account-view.c:1168
 #: ../capplet/settings/mail-settings-view.c:256
 msgid "Close Tab"
 msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:1082
+#: ../capplet/settings/mail-account-view.c:1178
 msgid "Account Wizard"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
@@ -7154,7 +7166,7 @@ msgstr "ÐÐÑÑÐÐÑ ÐÐÐ _ÐÐÑÑÑ"
 msgid "Save as draft"
 msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐ ÐÐÑÑÑ"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
 msgid "S_end"
 msgstr "ÐÐÑ_ÐÑÐ"
 
@@ -7306,23 +7318,23 @@ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑ."
 msgid "Click here to select folders to post to"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ"
 
-#: ../composer/e-composer-private.c:247
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:251
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:255
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "ÐÑÐÑÑÐÐÑÑÐ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:259
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "ÐÑÐÑÑÐÐÑÑÐ Ð ÐÐÐÐÑÑÑÐ ÑÐÐÑÑ"
 
-#: ../composer/e-composer-private.c:369
+#: ../composer/e-composer-private.c:337
 msgid "Save draft"
 msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÑÑÑ"
 
@@ -8077,11 +8089,19 @@ msgid "Whether or not to use the notification tray for display reminders"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐÑ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid "Preferred New button item"
+msgstr "ÐÐÑÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+msgid "Name of the preferred New toolbar button item"
+msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐÐÑÐ"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -8089,36 +8109,36 @@ msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐÐâ) ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ "
 "âÐÐÐÐÐÐÐÑâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐâ) ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ âÐÐÐÐÑÐÐâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐÐâ) ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ âÐÐÐÐÑÐâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Free/busy template URL"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8127,101 +8147,101 @@ msgstr ""
 "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ Ñ ÐÐÐÑÐÑÐÑÑ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ, %u ÑÐ "
 "ÐÐÐÐÑÑÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ, Ð %d ÐÐÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Recurrent Events in Italic"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐ Ñ "
 "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "List of selected calendars"
 msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "List of calendars to load"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "List of selected memo lists"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑ ÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "List of memo lists to load"
 msgstr "ÐÐÐÑÐÐ ÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "List of selected task lists"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑ ÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "List of task lists to load"
 msgstr "ÐÐÐÑÐÐ ÑÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Show the memo preview pane"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "ÐÐÐÐÐÐÐ ÑÐ âÑÐÑÐÐâ, Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Show the task preview pane"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "ÐÐÐÐÐÐÐ ÑÐ âÑÐÑÐÐâ, Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÐÑÐÐÐÐÐÑ ÑÐÐÐÐ ÐÐÐÐÑÐ Ð "
 "ÐÑÐÑÑÐÐÐÐÐÑÑ ÐÐÑÑÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Vertical position for the tag pane"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Highlight tasks due today"
 msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ Ñ ÑÐÐÑ ÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "ÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐ Ñ ÑÐÐÑ ÐÐÐÐ ÐÐÑÐ ÐÑÑÐÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÐÑÐÐ (ÐÐÑÐ-ÐÐÐÐÑÐÐ-Ñ-"
 "ÑÐÐÑ-ÐÐÐÐ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 msgid "Tasks due today color"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8229,17 +8249,17 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑ, Ñ ÐÐÐÐÐÑ â#rrggbbâ. ÐÐÑÐÑÑÐ ÑÐ ÐÐÑÐÐÐÐ ÑÐ "
 "ÐÑÑÐÑÐÑÐÐ-ÐÐÐÐÑÐÐ-Ñ-ÑÐÐÑ-ÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
 msgid "Task preview pane position (horizontal)"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (ÑÐÑÐÐÐÐÑÐÐÐÐ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Task layout style"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8249,32 +8269,32 @@ msgstr ""
 "â0â (ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ. "
 "â1â (ÐÐÑÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Task preview pane position (vertical)"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (ÐÐÑÑÐÐÐÐÐÐ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Highlight overdue tasks"
 msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "ÐÐ ÐÐ ÑÐ ÐÐÐÑÐÑÑÐÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÑÑÐÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÐÑÐÐ (ÐÐÑÐ-ÐÐÐÑÐÑÑÐÐÐÐ-"
 "ÐÐÐÐÑÐÐ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
 msgid "Overdue tasks color"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8282,21 +8302,21 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑÐÐÐ, Ñ ÐÐÐÐÐÑ â#rrggbbâ. ÐÐÑÐÑÑÐ ÑÐ ÐÐÑÐÐÐÐ "
 "ÑÐ ÐÑÑÐÑÐÑÐÐ-ÐÐÐÑÐÑÑÐÐÐÑ-ÐÐÐÐÑÐÐ."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Time divisions"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "ÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ Ð ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ, Ñ ÐÐÐÑÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Timezone"
 msgstr "ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8304,57 +8324,57 @@ msgstr ""
 "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐ ÐÐÑÑÐ Ð ÐÑÐÐÐ, ÐÐÐ "
 "ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÐÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÐÐ, ÐÐÐ âÐÐÐÑÐÐÐ/ÐÑÑÐÑÐâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Twenty four hour time format"
 msgstr "24-ÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÐÑÐÑÐÑÐÑÐÐÐÐÐ ÑÐÑÐÐÑÑ, ÑÐÐÑÑÐ am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Birthday and anniversary reminder"
 msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Default appointment reminder"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Whether to set a default reminder for appointments"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Use system timezone"
 msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÑÐÑÑÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÑÐÑÑÐÐÐ ÑÐÐÑÑÐ ÐÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "Week start"
 msgstr "ÐÐÑÐÑÐÐ ÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "ÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐ, ÐÐ ÐÐÐÐÑÐ (0) ÐÐ ÑÑÐÐÑÐ (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Work days"
 msgstr "ÐÐÐÐÐ ÐÐÐÐ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Days on which the start and end of work hours should be indicated"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÑ Ð ÐÐÐÑÑÐÐÐÑÑ ÑÐ ÑÐÐÐÐ ÑÐÑÐÐÐ"
 
@@ -8692,14 +8712,20 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Encode file names in an Outlook/GMail way"
+#| msgid "Encode file names in an Outlook/GMail way"
+msgid "Encode filenames in an Outlook/GMail way"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ ÐÑÑÐÑÐÐ/ÐÐÐÑÑÐ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 #: ../mail/evolution-mail.schemas.in.h:34
-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, "
+#| 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."
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
@@ -9942,8 +9968,9 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file name to be played."
-msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ."
+#| msgid "Sound file name to be played."
+msgid "Sound filename to be played."
+msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
@@ -10491,16 +10518,20 @@ msgid ""
 msgstr "ÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ Ð ÐÑÐÑÑÐ."
 
 #: ../e-util/e-system.error.xml.h:1
-msgid "File exists \"{0}\"."
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ â{0}â."
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐÑÐ?"
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Do you wish to overwrite it?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÑÐ?"
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+"ÐÐÑ ÐÐÑÑÐÑÐ ÐÐÑÐÑÐÐÐ Ñ â{0}â.  ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐÐ ÑÐÐÑÐÐÑ."
 
-#: ../e-util/e-system.error.xml.h:3 ../mail/mail.error.xml.h:113
-msgid "_Overwrite"
-msgstr "_ÐÑÐÐÐÑÐ"
+#: ../e-util/e-system.error.xml.h:3
+#| msgid "_Reply"
+msgid "_Replace"
+msgstr "_ÐÐÐÐÐÐ"
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
@@ -10760,13 +10791,15 @@ msgid "You must choose a date."
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐ."
 
 #: ../filter/filter.error.xml.h:3
-msgid "Missing file name."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÐ."
+#| msgid "Missing file name."
+msgid "Missing filename."
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
 
 # filter:bad-file secondary
 #: ../filter/filter.error.xml.h:4
-msgid "You must specify a file name."
-msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐÑÐ."
+#| msgid "You must specify a file name."
+msgid "You must specify a filename."
+msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ."
 
 #: ../filter/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
@@ -10876,11 +10909,8 @@ msgstr "ÐÑÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 msgid "Forwarded messages"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:385
-msgid "Scanning messages for duplicates"
-msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÑÑÐÐÐÐ"
-
-#: ../libemail-engine/e-mail-folder-utils.c:576
+#: ../libemail-engine/e-mail-folder-utils.c:378
+#: ../libemail-engine/e-mail-folder-utils.c:627
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -10889,25 +10919,29 @@ msgstr[1] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÐ"
 msgstr[2] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÐ"
 msgstr[3] "ÐÐÐÐÐÑÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:824
+#: ../libemail-engine/e-mail-folder-utils.c:472
+msgid "Scanning messages for duplicates"
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÑÑÐÐÐÐ"
+
+#: ../libemail-engine/e-mail-folder-utils.c:875
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:956
+#: ../libemail-engine/e-mail-folder-utils.c:1007
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ÐÐÑÐÑÐÐÐ â%sâ ÑÐ ÑÐÐÐÑÐÐÐ."
 
-#: ../libemail-engine/e-mail-folder-utils.c:960
+#: ../libemail-engine/e-mail-folder-utils.c:1011
 msgid "File has been removed."
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐ."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1070
 msgid "Removing attachments"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1181
+#: ../libemail-engine/e-mail-folder-utils.c:1232
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -10916,7 +10950,7 @@ msgstr[1] "ÐÑÐÐÐ %d ÐÐÑÑÐÐ"
 msgstr[2] "ÐÑÐÐÐ %d ÐÐÑÑÐÐ"
 msgstr[3] "ÐÑÐÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1535 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1586 ../mail/em-folder-utils.c:624
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
@@ -11028,7 +11062,7 @@ msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:790
-#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:906
+#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:909
 msgid "Sending message"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
 
@@ -11071,60 +11105,66 @@ msgid "Sending message %d of %d"
 msgstr "ÐÐÑÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:869
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐÐ"
-
-#: ../libemail-engine/mail-ops.c:873 ../mail/mail-send-recv.c:883
+#. Translators: The string is distinguished by total count of messages to be send. Failed messages is always more than zero.
+#: ../libemail-engine/mail-ops.c:870
+#, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐe"
+msgstr[1] "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐÐ"
+msgstr[2] "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐÐ"
+msgstr[3] "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐe"
+
+#: ../libemail-engine/mail-ops.c:876 ../mail/mail-send-recv.c:883
 msgid "Canceled."
 msgstr "ÐÑÐÐÐÐÐÐ."
 
-#: ../libemail-engine/mail-ops.c:875 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:878 ../mail/mail-send-recv.c:885
 msgid "Complete."
 msgstr "ÐÐÐÑÑÐÐÐ."
 
-#: ../libemail-engine/mail-ops.c:987
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:988
+#: ../libemail-engine/mail-ops.c:991
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1105
+#: ../libemail-engine/mail-ops.c:1108
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1178
+#: ../libemail-engine/mail-ops.c:1181
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ÐÑÐÐÐÐÐ Ð ÑÐÐÑÑÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1179
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1241
+#: ../libemail-engine/mail-ops.c:1244
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1458
+#: ../libemail-engine/mail-ops.c:1461
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1551
+#: ../libemail-engine/mail-ops.c:1554
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÑÐÐÑÐ Ñ â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1647
+#: ../libemail-engine/mail-ops.c:1650
 #, c-format
 msgid "Disconnecting %s"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑ ÑÐ â%sâ"
@@ -11166,7 +11206,7 @@ msgstr "ÐÐÐ_ÑÐÐÑÐÐÐÐÐÐ"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:509
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
 #: ../plugins/publish-calendar/publish-calendar.c:849
 msgid "Enabled"
@@ -11187,7 +11227,6 @@ msgid "Default"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:58
 #: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
@@ -11283,7 +11322,7 @@ msgid "_Later"
 msgstr "ÐÐÑÐÐ_ÑÐ"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:705
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Add Label"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐÑ"
 
@@ -11998,11 +12037,6 @@ msgctxt "mail-signature"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4773
-#: ../mail/em-account-editor.c:4808
-msgid "Never"
-msgstr "ÐÐÐÐÐÐ"
-
 #: ../mail/em-account-editor.c:1739
 msgid "Always"
 msgstr "ÐÐÐÐ"
@@ -12042,7 +12076,7 @@ msgstr ""
 "ÐÐÐÑÐÑÐ ÐÐÐ Ð ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÐÑÑ. âÐÐÐÐÐÐÐÐÐÐâ ÐÐÑÐ ÐÐ ÐÐÑÐÑÑ ÐÐÑÐ ÐÐÐÑÑÐÐÐ, "
 "ÐÑÐÐ ÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐ ÐÐÐÐÑÐÐ ÑÐÑÑÑÐÑÐ Ñ ÐÐÑÑÐÐ ÐÐÑÐ ÑÐÑÐÑÐ."
 
-#: ../mail/em-account-editor.c:2927 ../mail/em-account-editor.c:3119
+#: ../mail/em-account-editor.c:2927 ../mail/em-account-editor.c:3136
 msgid "Receiving Email"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
@@ -12050,7 +12084,7 @@ msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 msgid "Please configure the following account settings."
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3723
+#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3755
 msgid "Sending Email"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
 
@@ -12090,50 +12124,42 @@ msgstr ""
 "\n"
 "ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐâ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÑÑÐÐÐÐ."
 
-#: ../mail/em-account-editor.c:3485
+#: ../mail/em-account-editor.c:3502
 msgid "Check for _new messages every"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:3493
+#: ../mail/em-account-editor.c:3510
 msgid "minu_tes"
 msgstr "ÐÐÐÑ_ÑÐ"
 
-#: ../mail/em-account-editor.c:4186 ../mail/mail-config.ui.h:166
+#: ../mail/em-account-editor.c:4218 ../mail/mail-config.ui.h:166
 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:4241 ../mail/em-account-editor.c:4343
+#: ../mail/em-account-editor.c:4273 ../mail/em-account-editor.c:4375
 msgid "Receiving Options"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../mail/em-account-editor.c:4242 ../mail/em-account-editor.c:4344
+#: ../mail/em-account-editor.c:4274 ../mail/em-account-editor.c:4376
 msgid "Checking for New Messages"
 msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/em-account-editor.c:4767 ../mail/em-account-editor.c:4802
-msgid "Always (SSL)"
-msgstr "ÐÐÐÐ (ÐÐÐ)"
-
-#: ../mail/em-account-editor.c:4770 ../mail/em-account-editor.c:4805
-msgid "When possible (TLS)"
-msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑÑÐ (ÐÐÐ)"
-
-#: ../mail/em-account-editor.c:4847
+#: ../mail/em-account-editor.c:4879
 msgid "Setup Google con_tacts with Evolution"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐ_ÐÑÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../mail/em-account-editor.c:4854
+#: ../mail/em-account-editor.c:4886
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐ_ÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../mail/em-account-editor.c:4902
+#: ../mail/em-account-editor.c:4934
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "ÐÐÐÐÑÐÑÐ _ÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../mail/em-account-editor.c:4927
+#: ../mail/em-account-editor.c:4959
 msgid "Yahoo Calen_dar name:"
 msgstr "ÐÐÐÐÐ ÐÐ_ÑÑ ÐÐÐÐÐÐÐÑÐ:"
 
@@ -12764,6 +12790,14 @@ msgstr "ÐÐÐÑÐÑ _ÐÐÑÐÑÐÐÑÐÑÐÐÐ"
 msgid "O_pen With"
 msgstr "Ð_ÑÐÐÑÐ ÐÐÐÐÑÑ"
 
+#. Translators: Name of an Attachment button for a11y object
+#: ../mail/em-format-html-display.c:1396
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "Button"
+msgid "Attachment"
+msgstr "ÐÑÐÐÐÐ"
+
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
@@ -12788,7 +12822,7 @@ msgid "Subscribe To _All"
 msgstr "ÐÑÐÑÐÐÐ ÑÐ _ÐÐ ÑÐÐ"
 
 #: ../mail/em-subscription-editor.c:971 ../mail/em-subscription-editor.c:1824
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "_Unsubscribe"
 msgstr "_ÐÐÑÐÐÐ ÑÐ"
 
@@ -12825,7 +12859,7 @@ msgid "Su_bscribe"
 msgstr "Ð_ÑÐÑÐÐÐ ÑÐ"
 
 #: ../mail/em-subscription-editor.c:1823
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Unsubscribe from the selected folder"
 msgstr "ÐÐÑÐÐÐÑÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
 
@@ -13231,24 +13265,30 @@ msgid "Drag'n'drop export format"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ âÐÑÐÐÑÑÐ Ð ÑÐÐÑÐâ"
 
 #: ../mail/evolution-mail.schemas.in.h:236
+#| msgid ""
+#| "Define the email export format when doing drag'n'drop. Possible values "
+#| "are : mbox or pdf"
 msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
+"Define the email export format when doing drag'n'drop. Possible values are "
 "mbox or pdf"
 msgstr ""
 "ÐÐÑÐÑÑÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ. ÐÐÑÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐÑÐ Ð ÑÐÐÑÐÑÐ. "
-"ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ ÑÑ : âmboxâ ÐÐÐ âpdfâ"
+"ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ ÑÑ âmboxâ ÐÐÐ âpdfâ"
 
 #: ../mail/evolution-mail.schemas.in.h:237
 msgid "Format of the drag'n'drop export filename"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑÐ âÐÑÐÐÑÑÐ Ð ÑÐÐÑÐâ"
 
 #: ../mail/evolution-mail.schemas.in.h:238
+#| msgid ""
+#| "Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : "
+#| "1 (: email sent date), 2 (: drag'n'drop date)"
 msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
 msgstr ""
-"ÐÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐ : YYYmmDDHHMMSS_email_title ÐÐÐÑÑÐ "
-"ÐÑÐÐÐÐÑÑÐ : 1 (: ÐÐÑÑÐ ÑÐÐÑÐ ÐÐ. ÐÐÑÑÐ), 2 (: ÐÐÑÑÐ ÐÑÐÐÐÐÑÐÑÐ Ð ÑÐÐÑÐÐÐÑÐ)"
+"ÐÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐ YYYmmDDHHMMSS_email_title ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ "
+"ÑÑ: 1 (: ÐÐÑÑÐ ÑÐÐÑÐ ÐÐ. ÐÐÑÑÐ), 2 (: ÐÐÑÑÐ ÐÑÐÐÐÐÑÐÑÐ Ð ÑÐÐÑÐÐÐÑÐ)"
 
 #: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
@@ -13256,7 +13296,7 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
 #: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1038
+#: ../modules/mail/e-mail-shell-view.c:1042
 #: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "ÐÐÑÑÐ"
@@ -13433,7 +13473,6 @@ msgid "Default Behavior"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:12
-#| msgid "Format messages in _HTML"
 msgid "For_mat messages in HTML"
 msgstr "ÐÐÐÐÐÑÑ ÐÐÑÑÐÐ Ñ ÐÐÐ_Ð"
 
@@ -13446,14 +13485,14 @@ msgid "Always request rea_d receipt"
 msgstr "ÐÐÐÐ ÑÑÐÐÐ _ÐÐÐÑÐÑÐÐÑÑ"
 
 #: ../mail/mail-config.ui.h:15
-#| msgid "Encode file names in an Outlook/GMail way"
-msgid "Encode file names in an _Outlook/GMail way"
+#| msgid "Encode file names in an _Outlook/GMail way"
+msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "ÐÐÐÐÑÐÑ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ _ÐÑÑÐÑÐÐ/ÐÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:16
-#| msgid "C_haracter set:"
-msgid "Character _set:"
-msgstr "ÐÐÐÐÐ _ÑÐÑÐÐÑÐÐ:"
+#| msgid "Ch_aracter Encoding"
+msgid "Ch_aracter encoding:"
+msgstr "ÐÐÐÐÐ ÑÑ_ÑÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
@@ -13476,12 +13515,10 @@ msgid "_Keep signature above the original message on replying"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÑ _ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐ ÐÐÐÐÐÐÑÑ"
 
 #: ../mail/mail-config.ui.h:22
-#| msgid "Ignore Reply-To: for mailing lists"
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_ÐÐÐÐÐÐÑÐ âÐÐÐÐÐÐÑ-ÐÐ:â ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:23
-#| msgid "Group Reply goes only to mailing list, if possible"
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "ÐÐÐÐÐÐÑ _ÐÑÑÐÐ ÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ, ÐÐÐ ÑÐ ÐÐÐÑÑÐ"
 
@@ -13598,19 +13635,34 @@ msgstr "a"
 msgid "b"
 msgstr "Ð"
 
+#: ../mail/mail-config.ui.h:58
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "ÐÑÐÐÐÐÐ"
+
 #: ../mail/mail-config.ui.h:59
+#| msgid "Inline (Outlook style)"
+msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "ÐÐÑÑÐÑ (ÐÑÑÐÑÐ ÑÑÐÐ)"
 
 #: ../mail/mail-config.ui.h:60
+#| msgid "Quoted"
+msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "ÐÐÑÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:61
+#| msgid "Do not quote"
+msgctxt "ReplyForward"
 msgid "Do not quote"
 msgstr "ÐÐ ÑÐÑÐÑÐÑ"
 
 #: ../mail/mail-config.ui.h:62
+#| msgid "Inline"
+msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "ÐÐÑÑÐÑ"
 
@@ -14007,9 +14059,12 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ"
 msgid "_Server:"
 msgstr "Ð_ÐÑÐÐÑ:"
 
-#: ../mail/mail-config.ui.h:163
-msgid "User _Name:"
-msgstr "ÐÐÑÐÑÐÐÑÐÐ _ÐÐÐ:"
+#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:660
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
+msgid "User_name:"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:165
 msgid "Mailbox location"
@@ -14057,17 +14112,21 @@ msgid "T_ype:"
 msgstr "Ð_ÐÐ:"
 
 #: ../mail/mail-config.ui.h:177
+msgid "User _Name:"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ _ÐÐÐ:"
+
+#: ../mail/mail-config.ui.h:178
 msgid "Remember _password"
 msgstr "ÐÐÐÐ_ÐÑÐ ÐÐÐÐÐÐÑ"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../mail/mail-config.ui.h:178
+#: ../mail/mail-config.ui.h:179
 msgid "Personal Details:"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÑÐ:"
 
-#: ../mail/mail-config.ui.h:187
+#: ../mail/mail-config.ui.h:188
 msgid "Encryption:"
 msgstr "ÐÐÑÑÐÐÐÑÐ:"
 
@@ -14076,11 +14135,11 @@ msgstr "ÐÐÑÑÐÐÐÑÐ:"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:189
 msgid "none"
 msgstr "ÐÐÑÑÐ"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:190
 msgid "label"
 msgstr "ÐÐÑÐÐÑ"
 
@@ -14383,7 +14442,7 @@ msgstr ""
 "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÑÑÐÑÐÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑ ÑÐÑÑÐÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "_Empty Trash"
 msgstr "ÐÑÐÑÐÐÐÐ _ÐÐÐÑÐ"
 
@@ -14696,6 +14755,10 @@ msgstr ""
 msgid "Ignore"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
+#: ../mail/mail.error.xml.h:113
+msgid "_Overwrite"
+msgstr "_ÐÑÐÐÐÑÐ"
+
 #: ../mail/mail.error.xml.h:114
 msgid "_Append"
 msgstr "_ÐÑÐÐÐÑÐ"
@@ -14969,8 +15032,9 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ: %s"
 
 #: ../mail/mail-vfolder.c:219
 #, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ â%s : %sâ"
+#| msgid "Updating Search Folders for '%s' : %s"
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ â%s â %sâ"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
@@ -15142,27 +15206,27 @@ msgid "Subject or Addresses contains"
 msgstr "ÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Recipients contain"
 msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Message contains"
 msgstr "ÐÐÑÑÐÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Subject contains"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Sender contains"
 msgstr "ÐÐÑÐÑÐÐÐÑ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Body contains"
 msgstr "ÐÐÐÐ ÑÐÐÑÐÐ"
 
@@ -15372,7 +15436,7 @@ msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑ"
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:355
+#: ../modules/addressbook/e-book-shell-backend.c:356
 msgid "Certificates"
 msgstr "ÐÐÐÑÐÑÐ"
 
@@ -15430,7 +15494,7 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐ ÐÐ ÐÐ
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Rename..."
 msgstr "_ÐÑÐÐÐÐÐÑÑ..."
 
@@ -15511,7 +15575,7 @@ msgstr "_ÐÐÐÑÐ"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "_Preview"
 msgstr "_ÐÑÐÐÐÐÐ"
 
@@ -15523,6 +15587,7 @@ msgid "_Delete"
 msgstr "_ÐÐÑÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "_Properties"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
@@ -15549,7 +15614,7 @@ msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ Ñ ÐÑÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐ
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1506
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
 msgid "_Classic View"
 msgstr "_ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐ"
 
@@ -15560,7 +15625,7 @@ msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÑÐ
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Vertical View"
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐ"
 
@@ -15586,7 +15651,7 @@ msgstr "ÐÐ ÐÐÐÐÐÐÑÐ"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "ÐÐÐÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
@@ -15722,8 +15787,9 @@ msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
-msgid "cards"
-msgstr "ÐÐÑÑÐ"
+#| msgid "Contacts"
+msgid "contacts"
+msgstr "ÐÐÐÑÐÐÑÐ"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
@@ -16347,45 +16413,45 @@ msgstr "ÐÑÐÐÐ"
 msgid "Birthdays & Anniversaries"
 msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:451
 #: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:452
+#: ../modules/calendar/e-cal-shell-backend.c:456
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ_ÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:454
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgid "Create a new all-day appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:459
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Ð_ÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:461
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgid "Create a new meeting request"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:469
+#: ../modules/calendar/e-cal-shell-backend.c:473
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ÐÐÐÐ_ÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:471
+#: ../modules/calendar/e-cal-shell-backend.c:475
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:794
+#: ../modules/calendar/e-cal-shell-backend.c:798
 msgid "Calendar and Tasks"
 msgstr "ÐÐÐÐÐÐÐÑ Ð ÐÐÐÐÑÐ"
 
@@ -17090,14 +17156,6 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÐ"
 msgstr[2] "%d ÐÐÐÐÑÐÐÐ"
 msgstr[3] "%d ÐÐÐÐÑÐÐ"
 
-#: ../modules/mail/em-account-prefs.c:209
-msgid "Evolution Account Assistant"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
-
-#: ../modules/mail/em-account-prefs.c:253
-msgid "Account Editor"
-msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÐÐÐ"
-
 #: ../modules/mail/e-mail-attachment-handler.c:385
 #, c-format
 msgid "%d attached message"
@@ -17107,147 +17165,171 @@ msgstr[1] "%d ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 msgstr[2] "%d ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
 msgstr[3] "ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:204
+#: ../modules/mail/e-mail-shell-backend.c:226
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:206
+#: ../modules/mail/e-mail-shell-backend.c:228
 msgid "Compose a new mail message"
 msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:214
+#: ../modules/mail/e-mail-shell-backend.c:236
+#| msgid "Mail Accounts"
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "ÐÐÑÑÐÐÑÐÐ _ÐÐÐÐÐ"
+
+#: ../modules/mail/e-mail-shell-backend.c:238
+#| msgid "Create a new mail folder"
+msgid "Create a new mail account"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÑÑ"
+
+#: ../modules/mail/e-mail-shell-backend.c:243
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:216
+#: ../modules/mail/e-mail-shell-backend.c:245
 msgid "Create a new mail folder"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:431
+#: ../modules/mail/e-mail-shell-backend.c:460
 msgid "Mail Accounts"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:439
+#: ../modules/mail/e-mail-shell-backend.c:469
 msgid "Mail Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:447
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Composer Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÑÐÐÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:455
+#: ../modules/mail/e-mail-shell-backend.c:487
 msgid "Network Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-backend.c:721
+msgid "Evolution Account Assistant"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+
+#: ../modules/mail/e-mail-shell-backend.c:767
+msgid "Account Editor"
+msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÐÐÐ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 #: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "_ÐÐÐÐÐÐÑÑÐ ÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Disable this account"
 msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#| msgid "Change the properties of this folder"
+msgid "Edit properties of this account"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Download Messages for Offline Usage"
 msgstr "_ÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "ÐÑÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Fl_ush Outbox"
 msgstr "ÐÑ_ÐÑÐÐÐÐ âÐÐ ÑÐÐÑÐâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Copy Folder To..."
 msgstr "_ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ Ñ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Copy the selected folder into another folder"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Permanently remove this folder"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "E_xpunge"
 msgstr "ÐÐÐÐ_ÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Mar_k All Messages as Read"
 msgstr "ÐÐÐÐÑÐ ÑÐÐ ÐÐ_ÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Mark all messages in the folder as read"
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Move Folder To..."
 msgstr "_ÐÑÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ Ñ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Move the selected folder into another folder"
 msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_New..."
 msgstr "_ÐÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Create a new folder for storing mail"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Change the properties of this folder"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Refresh the folder"
 msgstr "ÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Change the name of this folder"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Select Message _Thread"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÑÑÐÐ ÐÑÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Select Message S_ubthread"
 msgstr "ÐÐÐÐÐÑÐ Ð_ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Select all replies to the currently selected message"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Empty _Trash"
 msgstr "ÐÐÐÐÑÐ _ÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_New Label"
 msgstr "_ÐÐÐÐ ÐÐÐÐÐÐ"
 
@@ -17256,189 +17338,189 @@ msgstr "_ÐÐÐÐ ÐÐÐÐÐÐ"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "N_one"
 msgstr "Ð_ÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Manage Subscriptions"
 msgstr "_ÐÐÑÐÐÑÐÑ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ÐÑÐÑÐÐÐ ÑÐ ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Send / _Receive"
 msgstr "ÐÐÐÑÐ / Ð_ÑÐÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Send queued items and retrieve new items"
 msgstr "ÐÐÑÐ ÐÑÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "R_eceive All"
 msgstr "Ð_ÑÐÐÐ ÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Receive new items from all accounts"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÑÐ ÑÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Send All"
 msgstr "Ð_ÐÑÐÑÐ ÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Send queued items in all accounts"
 msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐÐÐÐ ÐÐ ÑÐÐÐÑÑ Ñ ÑÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "ÐÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Cancel the current mail operation"
 msgstr "ÐÑÐÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÐÑÐÑÐÑÑ ÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Collapse All _Threads"
 msgstr "ÐÐÑÐÐ ÑÐÐ _ÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "Collapse all message threads"
 msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "E_xpand All Threads"
 msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÑÐ_ÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "Expand all message threads"
 msgstr "ÐÐÐÐÑÐÐÐÑÑÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "_Message Filters"
 msgstr "Ð_ÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Create or edit rules for filtering new mail"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1368
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "_Subscriptions..."
 msgstr "_ÐÑÐÑÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "F_older"
 msgstr "ÐÐÑ_ÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "_Label"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "C_reate Search Folder From Search..."
 msgstr "ÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Search F_olders"
 msgstr "ÐÐÑ_ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Create or edit search folder definitions"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÑÑÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_New Folder..."
 msgstr "_ÐÐÐÐ ÑÐÑÑÐÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "Show Message _Preview"
 msgstr "ÐÑÐÐÐ_ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview pane"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Show _Deleted Messages"
 msgstr "ÐÑÐÐÐÐÐ Ð_ÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Show deleted messages with a line through them"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐÐÐ)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_Group By Threads"
 msgstr "ÐÑÑÐÐÑÐ ÐÐ _ÑÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1487
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Threaded message list"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Show message preview below the message list"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview alongside the message list"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1523
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "All Messages"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1530
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Important Messages"
 msgstr "ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1537
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Last 5 Days' Messages"
 msgstr "ÐÐÑÑÐÐ Ñ ÐÐÐÑÐÑ 5 ÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1544
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Messages Not Junk"
 msgstr "ÐÐÑÑÐÐ ÐÐÑÑ ÑÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1551
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Messages with Attachments"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1558
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "No Label"
 msgstr "ÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Read Messages"
 msgstr "ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Recent Messages"
 msgstr "ÐÐÐÑÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Unread Messages"
 msgstr "ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Subject or Addresses contain"
 msgstr "ÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "All Accounts"
 msgstr "ÑÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1648
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Current Account"
 msgstr "ÑÐÐÑÑÐÐ ÐÐÐÐÐÑ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Current Folder"
 msgstr "ÑÐÐÑÑÐÑ ÑÐÑÑÐÐÐÐ"
 
@@ -17535,7 +17617,7 @@ msgstr "ÐÐÐÑÐ"
 msgid "Send / Receive"
 msgstr "ÐÐÑÐÑÐ / ÐÑÐÐÐ"
 
-#: ../modules/mail/em-composer-prefs.c:510
+#: ../modules/mail/em-composer-prefs.c:513
 msgid "Language(s)"
 msgstr "ÐÐÐÐÐ(ÑÐ)"
 
@@ -17775,7 +17857,7 @@ msgstr ""
 "ÐÐÐÑÐÐÐÑÐÐ Ñ ÐÐÐÐÑÑÐÑÑ. ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
 "ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÐÐÐ ÐÐ. ÐÐÑÑÐ Ð ÐÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:609
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐ..."
 
@@ -18223,13 +18305,6 @@ msgstr "_ÐÐÑÐÑÐ :"
 msgid "Use _secure connection"
 msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
-
 #: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "ÐÐ_ÑÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÐÐÑÑ"
@@ -18256,7 +18331,9 @@ msgid "_Customize options"
 msgstr "_ÐÑÐÐÐÐÐÐÐ ÐÐÑÐÑÐ"
 
 #: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
+#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
 msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
 
 #: ../plugins/calendar-file/calendar-file.c:157
@@ -18637,8 +18714,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:828
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Unknown error."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
 
@@ -19709,56 +19786,104 @@ msgid ""
 msgstr ""
 "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÑ â%sâ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÑÐÐÐÑÐ ÑÑÐÑÑ ÐÐÐÐÑÐÑ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:641
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to events. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÑ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ "
+"ÐÑ ÐÐÐÐÑÐ?"
+msgstr[1] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ "
+"ÐÑ ÐÐÐÐÑÐ?"
+msgstr[2] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ "
+"ÐÑ ÐÐÐÐÑÐ?"
+msgstr[3] ""
 "ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
 "ÐÐÐÐÑÐ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:644
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to tasks. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÑ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
+msgstr[1] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
+msgstr[2] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
+msgstr[3] ""
 "ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
 "ÐÐÐÐÑÐ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:655
 #, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to memos. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÑ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
+msgstr[1] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
+msgstr[2] ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
+msgstr[3] ""
 "ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
 "ÐÐÐÐÑÐ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:666
+#: ../plugins/mail-to-task/mail-to-task.c:676
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐÑÐÐ ÐÑÐÐÑÑÐÐÐÑ ÐÐÑÑÐ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:741
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[ÐÐÐ ÑÐÐÐÑÐÐ]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÑÐÑÐÐ ÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:828
+#: ../plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:835
+#: ../plugins/mail-to-task/mail-to-task.c:845
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19766,7 +19891,7 @@ msgstr ""
 "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ. "
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:848
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19774,7 +19899,7 @@ msgstr ""
 "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ. "
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:841
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19783,44 +19908,44 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
 # mail:no-copy-folder-nostore secondary
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1152
+#: ../plugins/mail-to-task/mail-to-task.c:1162
 msgid "No writable calendar is available."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÐÐÑÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create an _Event"
 msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÐÑÐÑ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new event from the selected message"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a Mem_o"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐ_Ñ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new memo from the selected message"
 msgstr "ÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a _Task"
 msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÐÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new task from the selected message"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a _Meeting"
 msgstr "ÐÐÐÑÐÐÐ _ÑÐÑÑÐÐÐÐ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a new meeting from the selected message"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
@@ -20843,7 +20968,7 @@ msgstr "ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ: %s"
 msgid "Execute these search parameters"
 msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-window.c:445
+#: ../shell/e-shell-window.c:487
 msgid "New"
 msgstr "ÐÐÐÐ"
 
@@ -20940,19 +21065,20 @@ msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ, ÐÐÐÑÐÐÑÐ Ð ÐÐÐÐÑÐÐÐ."
 
 #: ../shell/main.c:334
-msgid "Import URIs or file names given as rest of arguments."
-msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑ ÐÐÐ ÐÑÑÐÑÐÐ ÐÑÐÑÐÐÐÐÑÐ."
+#| msgid "Import URIs or file names given as rest of arguments."
+msgid "Import URIs or filenames given as rest of arguments."
+msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑ ÐÐÐ ÐÑÑÐÑÐÐ ÐÑÐÑÐÐÐÐÑÐ."
 
 # shell:noshell-reason title
 #: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐÐÑÑÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/main.c:507 ../shell/main.c:515
+#: ../shell/main.c:510 ../shell/main.c:518
 msgid "- The Evolution PIM and Email Client"
 msgstr "â ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÑ Ð-ÐÐÑÑÐ"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:583
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20961,7 +21087,7 @@ msgstr ""
 "%s: â--onlineâ Ð â--offlineâ ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
 "  ÐÐÐÑÐÐÐÑÐ â%s --helpâ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.\n"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:589
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21858,10 +21984,6 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÑÐÐÐÐ"
 msgid "Attachment Properties"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
-
 #: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "ÐÐÐÐ ÑÐÐ:"
@@ -21930,40 +22052,40 @@ msgstr[1] "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐ"
 msgstr[2] "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐ"
 msgstr[3] "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
 
-#: ../widgets/misc/e-attachment-view.c:404
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "ÐÑÐÐÑÐ ÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐ..."
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../widgets/misc/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "ÐÐÑ_ÑÐÐÑ ÑÐÐ"
 
-#: ../widgets/misc/e-attachment-view.c:437
+#: ../widgets/misc/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "ÐÐ_ÐÐÑ ÐÑÐÐÐÐ..."
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../widgets/misc/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "_ÐÐÐÑÐÑ"
 
-#: ../widgets/misc/e-attachment-view.c:468
+#: ../widgets/misc/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "ÐÐÐ_ÑÐÑ ÑÐÐ"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../widgets/misc/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÑÑÐÑ"
 
-#: ../widgets/misc/e-attachment-view.c:482
+#: ../widgets/misc/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÐ ÑÐÑÑÐÑ"
 
-#: ../widgets/misc/e-attachment-view.c:803
+#: ../widgets/misc/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "ÐÑÐÐÑÐ ÐÑÐÐÑÐÐÐÐ â%sâ"
 
-#: ../widgets/misc/e-attachment-view.c:806
+#: ../widgets/misc/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "ÐÑÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÐ Ñ â%sâ"
@@ -22061,10 +22183,6 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ Ð ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ "
 "ÐÐÑÐÐ ÑÐ ÑÐÐÐ ÑÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
-
 #: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
@@ -22184,7 +22302,7 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ ÑÐÑ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ."
 
-#: ../widgets/misc/e-preferences-window.c:279
+#: ../widgets/misc/e-preferences-window.c:308
 msgid "Evolution Preferences"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
@@ -22759,6 +22877,34 @@ msgstr "ÐÐÐÐÐÑÐ ÑÐÐ"
 msgid "Input Methods"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐ"
 
+#~ msgid "Recent _Documents"
+#~ msgstr "ÐÐÐÑÐÑÑÐ _ÐÐÐÑÐÐÐÑÐ"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ..."
+
+#~ msgid "never"
+#~ msgstr "ÐÐÐÐÐÐ"
+
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ â{0}â."
+
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÑÐ?"
+
+#~| msgid "C_haracter set:"
+#~ msgid "Character _set:"
+#~ msgstr "ÐÐÐÐÐ _ÑÐÑÐÐÑÐÐ:"
+
+#~ msgid "cards"
+#~ msgstr "ÐÐÑÑÐ"
+
+#~ msgid "File _name:"
+#~ msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
+
+#~ msgid "_Filename:"
+#~ msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
+
 #~ msgid "URL:"
 #~ msgstr "ÐÐÑÐÑÐ :"
 
diff --git a/po/sr latin po b/po/sr latin po
index 5a128e8..d28edc7 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,18 +1,18 @@
 # Serbian translation of evolution
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003â2012.
 # This file is distributed under the same license as the evolution package.
 # Maintainer: Igor NestoroviÄ <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by Igor NestoroviÄ <igor prevod org>
 # MiloÅ PopoviÄ <gpopac gmail com>, 2010.
 # Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
-#: ../shell/main.c:567
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
 "ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-02-14 14:48+0000\n"
-"PO-Revision-Date: 2012-02-15 10:23+0200\n"
+"POT-Creation-Date: 2012-02-19 02:09+0000\n"
+"PO-Revision-Date: 2012-02-19 14:19+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -294,6 +294,7 @@ msgstr "_Gde:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -438,7 +439,7 @@ msgstr "_GodiÅnjica:"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-display.c:719
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:83
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "_RoÄendan:"
@@ -1446,28 +1447,34 @@ msgid "Importing..."
 msgstr "Uvozim..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:1075
-msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Autluk CSV ili Tab (.csv, .tab)"
+#| msgid "Outlook CSV or Tab (.csv, .tab)"
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
+msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1076
-msgid "Outlook CSV and Tab Importer"
-msgstr "Autluk CSV i Tab uvoznik"
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook Contacts CSV and Tab Importer"
+msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1084
-msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozila CSV ili Tab (.csv, .tab)"
+#| msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
+msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1085
-msgid "Mozilla CSV and Tab Importer"
-msgstr "Mozila CSV i Tab uvoznik"
+#| msgid "Mozilla CSV and Tab Importer"
+msgid "Mozilla Contacts CSV and Tab Importer"
+msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1093
-msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "Evolucija CSV ili Tab (.csv, .tab)"
+#| msgid "Evolution CSV or Tab (.csv, .tab)"
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
+msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1094
-msgid "Evolution CSV and Tab Importer"
-msgstr "Evolucijin CSV i Tab uvoznik"
+#| msgid "Evolution CSV and Tab Importer"
+msgid "Evolution Contacts CSV and Tab Importer"
+msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -1475,7 +1482,7 @@ msgstr "LDAP oblik razmene podataka (.ldif)"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
-msgstr "Evolucija LDIF uvoznik"
+msgstr "Evolucijin LDIF uvoznik"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
@@ -2605,101 +2612,101 @@ msgstr "%s  NaÄinili ste izmene. Da zanemarim te izmene i da osveÅim ureÄiva
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste naÄinili izmene, da osveÅim ureÄivaÄ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:276
+#: ../calendar/gui/dialogs/comp-editor.c:275
 msgid "Could not save attachments"
 msgstr "Ne mogu da saÄuvam priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "Ne mogu da osveÅim objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:749
 msgid "Edit Appointment"
 msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:757
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazivanje â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljen zadatak â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Memo - %s"
 msgstr "BeleÅka â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "No Summary"
 msgstr "Bez saÅetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:909
+#: ../calendar/gui/dialogs/comp-editor.c:908
 msgid "Keep original item?"
 msgstr "ZadrÅati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129 ../mail/e-mail-browser.c:137
+#: ../calendar/gui/dialogs/comp-editor.c:1128 ../mail/e-mail-browser.c:137
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "UmnoÅite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:144
+#: ../calendar/gui/dialogs/comp-editor.c:1135 ../mail/e-mail-browser.c:144
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "ObriÅite izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "View help"
 msgstr "Pogledaj pomoÄ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157 ../mail/e-mail-browser.c:151
+#: ../calendar/gui/dialogs/comp-editor.c:1156 ../mail/e-mail-browser.c:151
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska iseÄaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "Save current changes"
 msgstr "SaÄuvajte tekuÄe izmene"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:158
+#: ../calendar/gui/dialogs/comp-editor.c:1184 ../mail/e-mail-browser.c:158
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1191
 msgid "_Classification"
 msgstr "Ozna_ka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:172
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -2708,137 +2715,132 @@ msgstr "Ozna_ka"
 msgid "_Edit"
 msgstr "_UreÄivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206 ../mail/e-mail-browser.c:165
+#: ../calendar/gui/dialogs/comp-editor.c:1205 ../mail/e-mail-browser.c:165
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 #: ../shell/e-shell-window-actions.c:1628
 msgid "_Help"
 msgstr "_PomoÄ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1219
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227
+#: ../calendar/gui/dialogs/comp-editor.c:1226
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Opcije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
+#: ../calendar/gui/dialogs/comp-editor.c:1233 ../mail/e-mail-browser.c:179
 #: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1245
 #: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "PriloÅite datoteku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1253
 msgid "_Categories"
 msgstr "Ka_tegorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1255
 msgid "Toggles whether to display categories"
 msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1263
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "Classify as public"
 msgstr "OznaÄite kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "_Private"
 msgstr "L_iÄno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1281
 msgid "Classify as private"
 msgstr "OznaÄite kao liÄno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Classify as confidential"
 msgstr "OznaÄite kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1297
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "R_ole Field"
 msgstr "Polje _uloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether the Role field is displayed"
 msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "_RSVP"
 msgstr "_Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1307
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "_Status Field"
 msgstr "Polje _stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Toggles whether the Status field is displayed"
 msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1320
 msgid "_Type Field"
 msgstr "Polje _tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "SkoraÅnji _dokumenti"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../calendar/gui/dialogs/comp-editor.c:2044
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "PriloÅi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:2590
-#: ../calendar/gui/dialogs/comp-editor.c:3582
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2553
+#: ../calendar/gui/dialogs/comp-editor.c:3545
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Promene naÄinjene na ovoj stavki mogu biti zanemarene ako bude aÅurirano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3546
+#: ../calendar/gui/dialogs/comp-editor.c:3509
 #: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3614
+#: ../calendar/gui/dialogs/comp-editor.c:3577
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim trenutno izdanje!"
 
@@ -2851,15 +2853,15 @@ msgstr "GreÅka provere: %s"
 msgid "Could not open destination"
 msgstr "Ne mogu da otvorim odrediÅte"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:126
 msgid "Destination is read only"
 msgstr "OdrediÅte je samo za Äitanje"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:160
 msgid "Cannot create object"
 msgstr "Ne mogu da napravim objekat"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:189
 msgid "Could not open source"
 msgstr "Ne mogu da otvorim izvor"
 
@@ -3032,7 +3034,6 @@ msgstr "Ovaj dogaÄaj ima podsetnike"
 
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
@@ -3310,6 +3311,12 @@ msgstr "Prima"
 msgid "_List:"
 msgstr "_Spisak:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Organi_zer:"
+msgstr "Organi_zator:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Prima:"
@@ -3759,11 +3766,6 @@ msgstr ""
 "Zadatak nije moguÄe ureÄivati, zato Åto izabrani spisak zadataka ne podrÅava "
 "dodeljene zadatke"
 
-#: ../calendar/gui/dialogs/task-page.c:350
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Organi_zer:"
-msgstr "Organi_zator:"
-
 #: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "Krajnji rok je pogreÅan"
@@ -3777,10 +3779,6 @@ msgstr "Ne mogu da otvorim zadatke u â%sâ : %s"
 msgid "D_ue date:"
 msgstr "Kra_jnji rok:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Categor_ies..."
-msgstr "Ka_tegorije..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "Vremenska zona:"
@@ -3900,7 +3898,7 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1838
+#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1839
 #: ../calendar/gui/e-day-view-top-item.c:852
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
@@ -3936,7 +3934,7 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1854
+#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1855
 #: ../calendar/gui/e-day-view-top-item.c:856
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -4334,14 +4332,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
 #: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
 #: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
 #: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
 #: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
 msgid "pm"
@@ -4358,13 +4356,13 @@ msgstr "pop"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1821 ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1822 ../calendar/gui/e-day-view-top-item.c:848
 #: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2638
+#: ../calendar/gui/e-day-view.c:2639
 #, c-format
 msgid "Week %d"
 msgstr "%d nedelja"
@@ -6802,38 +6800,38 @@ msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
+#: ../capplet/anjal-settings-main.c:161
 msgid "ID of the socket to embed in"
 msgstr "IB prikljuÄka za umetanje"
 
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:162
 msgid "socket"
 msgstr "prikljuÄak"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Unesite vaÅe puno ime."
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "Unesite adresu e-poÅte."
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "Uneta adresa e-poÅte nije ispravna."
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "Unesite vaÅu lozinku."
 
-#: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5363 ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:282
+#: ../mail/em-account-editor.c:5395 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "KolDAV"
 
-#: ../capplet/settings/mail-account-view.c:374
-#: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:5234 ../mail/em-account-editor.c:5291
+#: ../capplet/settings/mail-account-view.c:376
+#: ../capplet/settings/mail-account-view.c:421
+#: ../mail/em-account-editor.c:5266 ../mail/em-account-editor.c:5323
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6841,55 +6839,69 @@ msgstr "KolDAV"
 msgid "Google"
 msgstr "Gugl"
 
+#: ../capplet/settings/mail-account-view.c:498
+#: ../capplet/settings/mail-account-view.c:602
+#: ../mail/em-account-editor.c:4799 ../mail/em-account-editor.c:4834
+msgid "Always (SSL)"
+msgstr "Uvek (SSL)"
+
+#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:605
+#: ../mail/em-account-editor.c:4802 ../mail/em-account-editor.c:4837
+msgid "When possible (TLS)"
+msgstr "Kada je moguÄe (TLS)"
+
+#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4805
+#: ../mail/em-account-editor.c:4840
+msgid "Never"
+msgstr "Nikada"
+
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../capplet/settings/mail-account-view.c:486
+#: ../capplet/settings/mail-account-view.c:512
 msgid "Personal details:"
 msgstr "LiÄni podaci:"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:179
+#: ../capplet/settings/mail-account-view.c:519 ../mail/mail-config.ui.h:180
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:180
+#: ../capplet/settings/mail-account-view.c:528 ../mail/mail-config.ui.h:181
 msgid "Email address:"
 msgstr "Adresa e-poÅte:"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:181
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:182
 msgid "Details:"
 msgstr "Detalji:"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:182
+#: ../capplet/settings/mail-account-view.c:546 ../mail/mail-config.ui.h:183
 msgid "Receiving"
 msgstr "Primanje"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:184
+#: ../capplet/settings/mail-account-view.c:553 ../mail/mail-config.ui.h:185
 msgid "Server type:"
 msgstr "Tip servera: "
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:185
+#: ../capplet/settings/mail-account-view.c:562 ../mail/mail-config.ui.h:186
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:186
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:187
 msgid "Username:"
 msgstr "KorisniÄkoime:"
 
-#: ../capplet/settings/mail-account-view.c:554
+#: ../capplet/settings/mail-account-view.c:580
 msgid "Use encryption:"
 msgstr "Koristi Åifrovanje:"
 
-#: ../capplet/settings/mail-account-view.c:559
-#: ../capplet/settings/mail-account-view.c:594
-msgid "never"
-msgstr "nikada"
-
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:183
+#: ../capplet/settings/mail-account-view.c:613 ../mail/mail-config.ui.h:184
 msgid "Sending"
 msgstr "Slanje"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:656
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -6899,7 +6911,7 @@ msgstr ""
 "e-poÅte i lozinku da pokuÅamo da prepoznamo postavke. Ukoliko to nije moguÄe "
 "automatski, moraÄete da dodate i podatke o serveru."
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:658
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -6909,11 +6921,11 @@ msgstr ""
 "PokuÅali smo da sa podacima koje ste uneli zapoÄnemo podeÅavanje, ali moÅda "
 "Äe biti potrebno da ih izmenite."
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:660
 msgid "You can specify more options to configure the account."
 msgstr "MoÅete da navedete joÅ opcija za podeÅavanje naloga."
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:662
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -6921,11 +6933,11 @@ msgstr ""
 "Sada su nam potrebne postavke za slanje poÅte. PokuÅali smo da pogodimo "
 "postavke, ali je potrebno da ih proverite."
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:663
 msgid "You can specify your default settings for your account."
 msgstr "MoÅete odrediti podrazumevane postavke naloga."
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:664
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -6933,103 +6945,103 @@ msgstr ""
 "Vreme je da proverimo postavke pre nego Åto pokuÅamo da se poveÅemo na "
 "server da bismo dobavili vaÅu poÅtu."
 
-#: ../capplet/settings/mail-account-view.c:636
-#: ../mail/em-account-editor.c:2924 ../mail/em-account-editor.c:3060
+#: ../capplet/settings/mail-account-view.c:679
+#: ../mail/em-account-editor.c:2924 ../mail/em-account-editor.c:3063
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:636
+#: ../capplet/settings/mail-account-view.c:679
 msgid "Next - Receiving mail"
 msgstr "Napred â Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Receiving mail"
 msgstr "Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Next - Sending mail"
 msgstr "Napred â Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Back - Identity"
 msgstr "Nazad â Identitet"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Next - Receiving options"
 msgstr "Napred â Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Receiving options"
 msgstr "Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving mail"
 msgstr "Nazad â Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Sending mail"
 msgstr "Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Next - Review account"
 msgstr "Napred â Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Next - Defaults"
 msgstr "Napred â Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving options"
 msgstr "Nazad â Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:4044
+#: ../capplet/settings/mail-account-view.c:684
+#: ../mail/em-account-editor.c:4076
 msgid "Defaults"
 msgstr "Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Back - Sending mail"
 msgstr "Nazad â Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Review account"
 msgstr "Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Finish"
 msgstr "ZavrÅetak"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Back - Sending"
 msgstr "Nazad â Slanje"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:856
 msgid "Setup Google contacts with Evolution"
 msgstr "Podesite Gugl kontakte sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:857
 msgid "Setup Google calendar with Evolution"
 msgstr "Podesite Gugl kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4862
+#: ../capplet/settings/mail-account-view.c:862
+#: ../mail/em-account-editor.c:4894
 msgid "You may need to enable IMAP access."
 msgstr "MoÅda Äete morati da omoguÄite IMAP pristup."
 
-#: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4839
+#: ../capplet/settings/mail-account-view.c:870
+#: ../mail/em-account-editor.c:4871
 msgid "Google account settings:"
 msgstr "PodeÅavanja Gugl naloga:"
 
-#: ../capplet/settings/mail-account-view.c:806
+#: ../capplet/settings/mail-account-view.c:896
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Podesite Jahu kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4909
+#: ../capplet/settings/mail-account-view.c:900
+#: ../mail/em-account-editor.c:4941
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7039,25 +7051,25 @@ msgstr ""
 "formiramo ime kalendara. Potvrdite ili unesite drugo ukoliko predloÅeno nije "
 "ispravno."
 
-#: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4894
+#: ../capplet/settings/mail-account-view.c:909
+#: ../mail/em-account-editor.c:4926
 msgid "Yahoo account settings:"
 msgstr "PodeÅavanja Jahu naloga:"
 
-#: ../capplet/settings/mail-account-view.c:833
+#: ../capplet/settings/mail-account-view.c:923
 msgid "Yahoo Calendar name:"
 msgstr "Ime Jahu kalendara:"
 
-#: ../capplet/settings/mail-account-view.c:1020
+#: ../capplet/settings/mail-account-view.c:1116
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../capplet/settings/mail-account-view.c:1072
+#: ../capplet/settings/mail-account-view.c:1168
 #: ../capplet/settings/mail-settings-view.c:256
 msgid "Close Tab"
 msgstr "Zatvori jeziÄak"
 
-#: ../capplet/settings/mail-account-view.c:1082
+#: ../capplet/settings/mail-account-view.c:1178
 msgid "Account Wizard"
 msgstr "Äarobnjak naloga"
 
@@ -7154,7 +7166,7 @@ msgstr "SaÄuvaj kao _nacrt"
 msgid "Save as draft"
 msgstr "SaÄuvajte kao nacrt"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
 msgid "S_end"
 msgstr "PoÅ_alji"
 
@@ -7306,23 +7318,23 @@ msgstr "Kliknite ovde za adresar."
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:247
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "Opoziva poslednju radnju"
 
-#: ../composer/e-composer-private.c:251
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "Ponovo vrÅi opozvanu radnju"
 
-#: ../composer/e-composer-private.c:255
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "PretraÅuje tekst"
 
-#: ../composer/e-composer-private.c:259
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "PretraÅuje i zamenjuje tekst"
 
-#: ../composer/e-composer-private.c:369
+#: ../composer/e-composer-private.c:337
 msgid "Save draft"
 msgstr "SaÄuvajte nacrt"
 
@@ -8077,11 +8089,19 @@ msgid "Whether or not to use the notification tray for display reminders"
 msgstr "Da li da koristi obaveÅtajnu zonu za prikazivanje podsetnika"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid "Preferred New button item"
+msgstr "Åeljena stavka novog dugmeta"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+msgid "Name of the preferred New toolbar button item"
+msgstr "Naziv Åeljene stavke novog dugmeta linije alata"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "Primarni kalendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -8089,36 +8109,36 @@ msgstr ""
 "JIB izabranog (ili âprimarnogâ) kalendara u boÄnoj povrÅi u pregledu "
 "âKalendarâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "Primarni spisak beleÅki"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr ""
 "JIB izabrane (ili âprimarneâ) beleÅke u boÄnoj povrÅi u pregledu âBeleÅkeâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 msgstr ""
 "JIB izabranog (ili âprimarnogâ) zadatka u boÄnoj povrÅi u pregledu âZadaciâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8127,101 +8147,101 @@ msgstr ""
 "Model adrese za koriÅÄenje u povraÄaju vremena slobodno/zauzeto, %u se "
 "zamenjuje korisniÄkim delom elektronske adrese, a %d domenom"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Recurrent Events in Italic"
 msgstr "DogaÄaji ponavljanja iskoÅenim slovima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "Prikazuje dane sa dogaÄajima koji se ponavljaju iskoÅenim slovnim likom u "
 "donjem levom kalendaru"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "List of selected calendars"
 msgstr "ObriÅite izabrane kalendare"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "List of calendars to load"
 msgstr "Spisak dostupnih kalendara"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "List of selected memo lists"
 msgstr "Spisak izabranih spiskova beleÅki"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "List of memo lists to load"
 msgstr "Spisak spiskova beleÅki za uÄitavanje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "List of selected task lists"
 msgstr "Spisak izabranih spiskova zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "List of task lists to load"
 msgstr "Spisak spiskova zaduÅenja za uÄitavanje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "Prikazuje vremena zakazanog zavrÅetka u nedeljnim i meseÄnim pregledima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Show the memo preview pane"
 msgstr "Prikazuje pregled beleÅki"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Ukoliko je âtaÄnoâ, u glavnom prozoru prikazuje pregled beleÅki"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Show the task preview pane"
 msgstr "Prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Ukoliko je âtaÄnoâ, u glavnom prozoru prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Prikazuje broj nedelje u dnevnom pregledu, u pregledu radne nedelje i "
 "pretraÅivaÄu datuma"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Da li da pokaÅe brojeve nedelja na raznim mestima u kalendaru"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Vertical position for the tag pane"
 msgstr "Uspravan poloÅaj za povrÅ oznake"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Highlight tasks due today"
 msgstr "Isticanje zadataka u toku dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Da li Äe zadaci u toku dana biti istaknuti posebnom bojom (boja-zadatka-u-"
 "toku-dana)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 msgid "Tasks due today color"
 msgstr "Boja zadatka za danas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8229,17 +8249,17 @@ msgstr ""
 "Boja pozadine zaduÅenja za danas, u obliku â#rrggbbâ. Koristi se zajedno sa "
 "isticanjem-zadatka-u-toku-dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
 msgid "Task preview pane position (horizontal)"
 msgstr "Pozicija pregleda zadataka (horizontalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Task layout style"
 msgstr "Stil razmeÅtaja"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8249,32 +8269,32 @@ msgstr ""
 "â0â (klasiÄan pregled) postavlja pregled ispod spiska zadataka. "
 "â1â (vertikalan pregled) postavlja pregled pored spiska zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Task preview pane position (vertical)"
 msgstr "Pozicija pregleda zadataka (vertikalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Highlight overdue tasks"
 msgstr "Isticanje neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Da li Äe neispunjeni zadaci biti istaknuti posebnom bojom (boja-neispunjenog-"
 "zadatka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
 msgid "Overdue tasks color"
 msgstr "Boja neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8282,21 +8302,21 @@ msgstr ""
 "Boja pozadine neispunjenih zadataka, u obliku â#rrggbbâ. Koristi se zajedno "
 "sa isticanjem-neispunjenih-zadatka."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Time divisions"
 msgstr "Podela vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8304,57 +8324,57 @@ msgstr ""
 "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
 "neprevedeno mesto baze vremenske zone Olsen, kao âAmerika/Njujorkâ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Twenty four hour time format"
 msgstr "24-Äasovni oblik vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Birthday and anniversary reminder"
 msgstr "Podsetnik na roÄendane i godiÅnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Da li da postavi podsetnik na roÄendane i godiÅnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za zakazivanje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Whether to set a default reminder for appointments"
 msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Use system timezone"
 msgstr "Koristi vremensku zonu sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "Week start"
 msgstr "PoÄetak nedelje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "Dan kojim poÄinje nedelja, od nedelje (0) do subote (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Work days"
 msgstr "Radni dani"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 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"
 
@@ -8692,14 +8712,20 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Encode file names in an Outlook/GMail way"
+#| msgid "Encode file names in an Outlook/GMail way"
+msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Kodiranje naziva datoteka na naÄin Autluka/GpoÅte"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 #: ../mail/evolution-mail.schemas.in.h:34
-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, "
+#| 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."
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
@@ -9942,8 +9968,9 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file name to be played."
-msgstr "Ime datoteke za puÅtanje."
+#| msgid "Sound file name to be played."
+msgid "Sound filename to be played."
+msgstr "Naziv datoteke za puÅtanje."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
@@ -10491,16 +10518,20 @@ msgid ""
 msgstr "Sistem za Åtampanje nije ponudio nikakve dodatne detalje o greÅci."
 
 #: ../e-util/e-system.error.xml.h:1
-msgid "File exists \"{0}\"."
-msgstr "Datoteka postoji â{0}â."
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "Datoteka pod nazivom â{0}â veÄ postoji. Da li Åelite da je zamenite?"
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Do you wish to overwrite it?"
-msgstr "Åelite li da je prepiÅete?"
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+"VeÄ postoji datoteka u â{0}â.  Ukoliko je zamenite prepisaÄete njen sadrÅaj."
 
-#: ../e-util/e-system.error.xml.h:3 ../mail/mail.error.xml.h:113
-msgid "_Overwrite"
-msgstr "_PrepiÅi"
+#: ../e-util/e-system.error.xml.h:3
+#| msgid "_Reply"
+msgid "_Replace"
+msgstr "_Zameni"
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
@@ -10760,13 +10791,15 @@ msgid "You must choose a date."
 msgstr "Morate da izaberete datum."
 
 #: ../filter/filter.error.xml.h:3
-msgid "Missing file name."
-msgstr "Nedostaje ime datoteke."
+#| msgid "Missing file name."
+msgid "Missing filename."
+msgstr "Nedostaje naziv datoteke."
 
 # filter:bad-file secondary
 #: ../filter/filter.error.xml.h:4
-msgid "You must specify a file name."
-msgstr "Morate dati ime datoteci."
+#| msgid "You must specify a file name."
+msgid "You must specify a filename."
+msgstr "Morate dati naziv datoteci."
 
 #: ../filter/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
@@ -10876,11 +10909,8 @@ msgstr "Äuvanje poruke u fasciklu â%sâ"
 msgid "Forwarded messages"
 msgstr "ProsleÄene poruke"
 
-#: ../libemail-engine/e-mail-folder-utils.c:385
-msgid "Scanning messages for duplicates"
-msgstr "TraÅim duplikate u porukama"
-
-#: ../libemail-engine/e-mail-folder-utils.c:576
+#: ../libemail-engine/e-mail-folder-utils.c:378
+#: ../libemail-engine/e-mail-folder-utils.c:627
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -10889,25 +10919,29 @@ msgstr[1] "DovlaÄim %d poruke"
 msgstr[2] "DovlaÄim %d poruka"
 msgstr[3] "DovlaÄim jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:824
+#: ../libemail-engine/e-mail-folder-utils.c:472
+msgid "Scanning messages for duplicates"
+msgstr "TraÅim duplikate u porukama"
+
+#: ../libemail-engine/e-mail-folder-utils.c:875
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjam fasciklu â%sâ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:956
+#: ../libemail-engine/e-mail-folder-utils.c:1007
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka â%sâ je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:960
+#: ../libemail-engine/e-mail-folder-utils.c:1011
 msgid "File has been removed."
 msgstr "Datoteka je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1070
 msgid "Removing attachments"
 msgstr "Uklanjam priloge"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1181
+#: ../libemail-engine/e-mail-folder-utils.c:1232
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -10916,7 +10950,7 @@ msgstr[1] "Äuvam %d poruke"
 msgstr[2] "Äuvam %d poruka"
 msgstr[3] "Äuvam jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1535 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1586 ../mail/em-folder-utils.c:624
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neispravna adresa fascikle â%sâ"
@@ -11028,7 +11062,7 @@ msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Nisam uspeo da prikaÄim u lokalnu fasciklu âPoslatoâ: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:790
-#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:906
+#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:909
 msgid "Sending message"
 msgstr "Slanje poruke"
 
@@ -11071,60 +11105,66 @@ msgid "Sending message %d of %d"
 msgstr "Åaljem poruku %d od %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:869
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "Nisam uspeo da poÅaljem %d od %d poruka"
-
-#: ../libemail-engine/mail-ops.c:873 ../mail/mail-send-recv.c:883
+#. Translators: The string is distinguished by total count of messages to be send. Failed messages is always more than zero.
+#: ../libemail-engine/mail-ops.c:870
+#, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "Nisam uspeo da poÅaljem %d od %d poruke"
+msgstr[1] "Nisam uspeo da poÅaljem %d od %d poruka"
+msgstr[2] "Nisam uspeo da poÅaljem %d od %d poruka"
+msgstr[3] "Nisam uspeo da poÅaljem %d od %d poruke"
+
+#: ../libemail-engine/mail-ops.c:876 ../mail/mail-send-recv.c:883
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../libemail-engine/mail-ops.c:875 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:878 ../mail/mail-send-recv.c:885
 msgid "Complete."
 msgstr "ZavrÅeno."
 
-#: ../libemail-engine/mail-ops.c:987
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "PremeÅtam poruke u â%sâ"
 
-#: ../libemail-engine/mail-ops.c:988
+#: ../libemail-engine/mail-ops.c:991
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "UmnoÅavam poruke u â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1105
+#: ../libemail-engine/mail-ops.c:1108
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "SmeÅtam fasciklu â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1178
+#: ../libemail-engine/mail-ops.c:1181
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Praznim i smeÅtam nalog â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1179
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Storing account '%s'"
 msgstr "SmeÅtam nalog â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1241
+#: ../libemail-engine/mail-ops.c:1244
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "OsveÅavam fasciklu â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1458
+#: ../libemail-engine/mail-ops.c:1461
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Praznim fasciklu â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1551
+#: ../libemail-engine/mail-ops.c:1554
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacujem smeÄe u â%sâ"
 
-#: ../libemail-engine/mail-ops.c:1647
+#: ../libemail-engine/mail-ops.c:1650
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Prekidam vezu sa â%sâ"
@@ -11166,7 +11206,7 @@ msgstr "Pod_razumevano"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:509
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
 #: ../plugins/publish-calendar/publish-calendar.c:849
 msgid "Enabled"
@@ -11187,7 +11227,6 @@ msgid "Default"
 msgstr "Podrazumevano"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:58
 #: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
@@ -11283,7 +11322,7 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:705
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Add Label"
 msgstr "Dodaj oznaku"
 
@@ -11998,11 +12037,6 @@ msgctxt "mail-signature"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4773
-#: ../mail/em-account-editor.c:4808
-msgid "Never"
-msgstr "Nikada"
-
 #: ../mail/em-account-editor.c:1739
 msgid "Always"
 msgstr "Uvek"
@@ -12042,7 +12076,7 @@ msgstr ""
 "Unesite ime i elektronsku adresu. âNeobaveznaâ polja ne moraju biti popunjena, "
 "osim ako ne Åelite da ove podatke ukljuÄite u poruke koje Åaljete."
 
-#: ../mail/em-account-editor.c:2927 ../mail/em-account-editor.c:3119
+#: ../mail/em-account-editor.c:2927 ../mail/em-account-editor.c:3136
 msgid "Receiving Email"
 msgstr "Primanje poÅte"
 
@@ -12050,7 +12084,7 @@ msgstr "Primanje poÅte"
 msgid "Please configure the following account settings."
 msgstr "Podesite sledeÄe postavke naloga."
 
-#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3723
+#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3755
 msgid "Sending Email"
 msgstr "Slanje poÅte"
 
@@ -12090,50 +12124,42 @@ msgstr ""
 "\n"
 "Kliknite âPrimeniâ da saÄuvate postavke."
 
-#: ../mail/em-account-editor.c:3485
+#: ../mail/em-account-editor.c:3502
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poÅtu svakih"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:3493
+#: ../mail/em-account-editor.c:3510
 msgid "minu_tes"
 msgstr "minu_ta"
 
-#: ../mail/em-account-editor.c:4186 ../mail/mail-config.ui.h:166
+#: ../mail/em-account-editor.c:4218 ../mail/mail-config.ui.h:166
 msgid "Security"
 msgstr "Bezbednost"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4241 ../mail/em-account-editor.c:4343
+#: ../mail/em-account-editor.c:4273 ../mail/em-account-editor.c:4375
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/em-account-editor.c:4242 ../mail/em-account-editor.c:4344
+#: ../mail/em-account-editor.c:4274 ../mail/em-account-editor.c:4376
 msgid "Checking for New Messages"
 msgstr "Proveranje za nove poruke"
 
-#: ../mail/em-account-editor.c:4767 ../mail/em-account-editor.c:4802
-msgid "Always (SSL)"
-msgstr "Uvek (SSL)"
-
-#: ../mail/em-account-editor.c:4770 ../mail/em-account-editor.c:4805
-msgid "When possible (TLS)"
-msgstr "Kada je moguÄe (TLS)"
-
-#: ../mail/em-account-editor.c:4847
+#: ../mail/em-account-editor.c:4879
 msgid "Setup Google con_tacts with Evolution"
 msgstr "Podesite Gugl ko_ntakte sa Evolucijom"
 
-#: ../mail/em-account-editor.c:4854
+#: ../mail/em-account-editor.c:4886
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "Podesite Gugl ka_lendar sa Evolucijom"
 
-#: ../mail/em-account-editor.c:4902
+#: ../mail/em-account-editor.c:4934
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "Podesite _Jahu kalendar sa Evolucijom"
 
-#: ../mail/em-account-editor.c:4927
+#: ../mail/em-account-editor.c:4959
 msgid "Yahoo Calen_dar name:"
 msgstr "Naziv Ja_hu kalendara:"
 
@@ -12764,6 +12790,14 @@ msgstr "Sakrij _neformatirano"
 msgid "O_pen With"
 msgstr "O_tvori pomoÄu"
 
+#. Translators: Name of an Attachment button for a11y object
+#: ../mail/em-format-html-display.c:1396
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "Button"
+msgid "Attachment"
+msgstr "Prilog"
+
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
@@ -12788,7 +12822,7 @@ msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
 #: ../mail/em-subscription-editor.c:971 ../mail/em-subscription-editor.c:1824
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
@@ -12825,7 +12859,7 @@ msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
 #: ../mail/em-subscription-editor.c:1823
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
@@ -13231,24 +13265,30 @@ msgid "Drag'n'drop export format"
 msgstr "Oblik izvoÅenja âprevuci i ubaciâ"
 
 #: ../mail/evolution-mail.schemas.in.h:236
+#| msgid ""
+#| "Define the email export format when doing drag'n'drop. Possible values "
+#| "are : mbox or pdf"
 msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
+"Define the email export format when doing drag'n'drop. Possible values are "
 "mbox or pdf"
 msgstr ""
 "OdreÄuje oblik izvoÅenja el. poÅte prilikom obavljanja prevlaÄenja i ubacanja. "
-"MoguÄe vrednosti su : âmboxâ ili âpdfâ"
+"MoguÄe vrednosti su âmboxâ ili âpdfâ"
 
 #: ../mail/evolution-mail.schemas.in.h:237
 msgid "Format of the drag'n'drop export filename"
 msgstr "Oblik naziva datoteke izvoÅenja âprevuci i ubaciâ"
 
 #: ../mail/evolution-mail.schemas.in.h:238
+#| msgid ""
+#| "Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : "
+#| "1 (: email sent date), 2 (: drag'n'drop date)"
 msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
 msgstr ""
-"IzveÅeni naziv datoteke Äe biti : YYYmmDDHHMMSS_email_title MoguÄe "
-"vrednosti : 1 (: datum slanja el. poÅte), 2 (: datum prevlaÄenja i ubacivanja)"
+"IzveÅeni naziv datoteke Äe biti YYYmmDDHHMMSS_email_title MoguÄe vrednosti "
+"su: 1 (: datum slanja el. poÅte), 2 (: datum prevlaÄenja i ubacivanja)"
 
 #: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
@@ -13256,7 +13296,7 @@ msgstr "UvoÅenje Elm podataka"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
 #: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1038
+#: ../modules/mail/e-mail-shell-view.c:1042
 #: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "PoÅta"
@@ -13433,7 +13473,6 @@ msgid "Default Behavior"
 msgstr "Podrazumevano ponaÅanje"
 
 #: ../mail/mail-config.ui.h:12
-#| msgid "Format messages in _HTML"
 msgid "For_mat messages in HTML"
 msgstr "Oblikuj poruke u HTM_L"
 
@@ -13446,14 +13485,14 @@ msgid "Always request rea_d receipt"
 msgstr "Uvek traÅi _povratnicu"
 
 #: ../mail/mail-config.ui.h:15
-#| msgid "Encode file names in an Outlook/GMail way"
-msgid "Encode file names in an _Outlook/GMail way"
+#| msgid "Encode file names in an _Outlook/GMail way"
+msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodiraj nazive datoteka na naÄin _Autluka/GpoÅte"
 
 #: ../mail/mail-config.ui.h:16
-#| msgid "C_haracter set:"
-msgid "Character _set:"
-msgstr "Kodni _raspored:"
+#| msgid "Ch_aracter Encoding"
+msgid "Ch_aracter encoding:"
+msgstr "Kodna st_rana:"
 
 #: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
@@ -13476,12 +13515,10 @@ msgid "_Keep signature above the original message on replying"
 msgstr "ZadrÅi potpis _iznad originalne poruke pri odgovoru"
 
 #: ../mail/mail-config.ui.h:22
-#| msgid "Ignore Reply-To: for mailing lists"
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Zanemari âOdgovor-za:â za dopisne liste"
 
 #: ../mail/mail-config.ui.h:23
-#| msgid "Group Reply goes only to mailing list, if possible"
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Odgovor _grupi ide samo na dopisnu listu, ako je moguÄe"
 
@@ -13598,19 +13635,34 @@ msgstr "a"
 msgid "b"
 msgstr "b"
 
+#: ../mail/mail-config.ui.h:58
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "PriloÅi"
+
 #: ../mail/mail-config.ui.h:59
+#| msgid "Inline (Outlook style)"
+msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Autluk stil)"
 
 #: ../mail/mail-config.ui.h:60
+#| msgid "Quoted"
+msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citirano"
 
 #: ../mail/mail-config.ui.h:61
+#| msgid "Do not quote"
+msgctxt "ReplyForward"
 msgid "Do not quote"
 msgstr "Ne citiraj"
 
 #: ../mail/mail-config.ui.h:62
+#| msgid "Inline"
+msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Unutar"
 
@@ -14007,9 +14059,12 @@ msgstr "PodeÅavanje"
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: ../mail/mail-config.ui.h:163
-msgid "User _Name:"
-msgstr "KorisniÄko _ime:"
+#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:660
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
+msgid "User_name:"
+msgstr "KorisniÄko_ime:"
 
 #: ../mail/mail-config.ui.h:165
 msgid "Mailbox location"
@@ -14057,17 +14112,21 @@ msgid "T_ype:"
 msgstr "T_ip:"
 
 #: ../mail/mail-config.ui.h:177
+msgid "User _Name:"
+msgstr "KorisniÄko _ime:"
+
+#: ../mail/mail-config.ui.h:178
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../mail/mail-config.ui.h:178
+#: ../mail/mail-config.ui.h:179
 msgid "Personal Details:"
 msgstr "LiÄni podaci:"
 
-#: ../mail/mail-config.ui.h:187
+#: ../mail/mail-config.ui.h:188
 msgid "Encryption:"
 msgstr "Åifrovanje:"
 
@@ -14076,11 +14135,11 @@ msgstr "Åifrovanje:"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:189
 msgid "none"
 msgstr "niÅta"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:190
 msgid "label"
 msgstr "natpis"
 
@@ -14383,7 +14442,7 @@ msgstr ""
 "Sigurno Åelite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "_Empty Trash"
 msgstr "Isprazni _SmeÄe"
 
@@ -14696,6 +14755,10 @@ msgstr ""
 msgid "Ignore"
 msgstr "Zanemari"
 
+#: ../mail/mail.error.xml.h:113
+msgid "_Overwrite"
+msgstr "_PrepiÅi"
+
 #: ../mail/mail.error.xml.h:114
 msgid "_Append"
 msgstr "_PrikaÄi"
@@ -14969,8 +15032,9 @@ msgstr "PodeÅavanje fascikle pretrage: %s"
 
 #: ../mail/mail-vfolder.c:219
 #, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "AÅuriranje fascikla pretrage za â%s : %sâ"
+#| msgid "Updating Search Folders for '%s' : %s"
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "AÅuriranje fascikla pretrage za â%s â %sâ"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
@@ -15142,27 +15206,27 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrÅe"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Recipients contain"
 msgstr "Primaoci sadrÅe"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Message contains"
 msgstr "Poruka sadrÅi"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Subject contains"
 msgstr "Naslov sadrÅi"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Sender contains"
 msgstr "PoÅiljalac sadrÅi"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Body contains"
 msgstr "Telo sadrÅi"
 
@@ -15372,7 +15436,7 @@ msgstr "Napravite novi adresar"
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../modules/addressbook/e-book-shell-backend.c:355
+#: ../modules/addressbook/e-book-shell-backend.c:356
 msgid "Certificates"
 msgstr "Uverenja"
 
@@ -15430,7 +15494,7 @@ msgstr "Prikazuje mapu sa svim kontaktima iz izabranih adresara"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
@@ -15511,7 +15575,7 @@ msgstr "_Radnje"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "_Preview"
 msgstr "_Pregled"
 
@@ -15523,6 +15587,7 @@ msgid "_Delete"
 msgstr "_ObriÅi"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "_Properties"
 msgstr "O_sobine"
 
@@ -15549,7 +15614,7 @@ msgstr "PrikaÅite mape u prozoru za pregled kontakata"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1506
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
 msgid "_Classic View"
 msgstr "_KlasiÄni prikaz"
 
@@ -15560,7 +15625,7 @@ msgstr "PrikaÅite pregled kontakta ispod kontakt liste"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
@@ -15586,7 +15651,7 @@ msgstr "Ne odgovara"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
@@ -15722,8 +15787,9 @@ msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
-msgid "cards"
-msgstr "karte"
+#| msgid "Contacts"
+msgid "contacts"
+msgstr "kontakti"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
@@ -16347,45 +16413,45 @@ msgstr "Vreme"
 msgid "Birthdays & Anniversaries"
 msgstr "RoÄendani i godiÅnjice"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:451
 #: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:452
+#: ../modules/calendar/e-cal-shell-backend.c:456
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:454
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:459
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:461
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:469
+#: ../modules/calendar/e-cal-shell-backend.c:473
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:471
+#: ../modules/calendar/e-cal-shell-backend.c:475
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:794
+#: ../modules/calendar/e-cal-shell-backend.c:798
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
@@ -17090,14 +17156,6 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../modules/mail/em-account-prefs.c:209
-msgid "Evolution Account Assistant"
-msgstr "PomoÄnik naloga Evolucije"
-
-#: ../modules/mail/em-account-prefs.c:253
-msgid "Account Editor"
-msgstr "UreÄivaÄ naloga"
-
 #: ../modules/mail/e-mail-attachment-handler.c:385
 #, c-format
 msgid "%d attached message"
@@ -17107,147 +17165,171 @@ msgstr[1] "%d priloÅene poruke"
 msgstr[2] "%d priloÅenih poruka"
 msgstr[3] "Jedna priloÅena poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:204
+#: ../modules/mail/e-mail-shell-backend.c:226
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:206
+#: ../modules/mail/e-mail-shell-backend.c:228
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:214
+#: ../modules/mail/e-mail-shell-backend.c:236
+#| msgid "Mail Accounts"
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "PoÅtanski _nalog"
+
+#: ../modules/mail/e-mail-shell-backend.c:238
+#| msgid "Create a new mail folder"
+msgid "Create a new mail account"
+msgstr "Napravite novi nalog za poÅtu"
+
+#: ../modules/mail/e-mail-shell-backend.c:243
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poÅtu"
 
-#: ../modules/mail/e-mail-shell-backend.c:216
+#: ../modules/mail/e-mail-shell-backend.c:245
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poÅtu"
 
-#: ../modules/mail/e-mail-shell-backend.c:431
+#: ../modules/mail/e-mail-shell-backend.c:460
 msgid "Mail Accounts"
 msgstr "PoÅtanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:439
+#: ../modules/mail/e-mail-shell-backend.c:469
 msgid "Mail Preferences"
 msgstr "Postavke poÅte"
 
-#: ../modules/mail/e-mail-shell-backend.c:447
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Composer Preferences"
 msgstr "Postavke sastavljaÄa"
 
-#: ../modules/mail/e-mail-shell-backend.c:455
+#: ../modules/mail/e-mail-shell-backend.c:487
 msgid "Network Preferences"
 msgstr "Postavke mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-backend.c:721
+msgid "Evolution Account Assistant"
+msgstr "PomoÄnik naloga Evolucije"
+
+#: ../modules/mail/e-mail-shell-backend.c:767
+msgid "Account Editor"
+msgstr "UreÄivaÄ naloga"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 #: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "_OnemoguÄi nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Disable this account"
 msgstr "OnemoguÄite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Trajno uklonite sve obrisane poruke iz svih fascikli"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#| msgid "Change the properties of this folder"
+msgid "Edit properties of this account"
+msgstr "Izmenite osobine ovog naloga"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Preuzmite poruke za naloge i fascikle koje su oznaÄene za rad van mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni âZa slanjeâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Copy Folder To..."
 msgstr "_UmnoÅi fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Copy the selected folder into another folder"
 msgstr "UmnoÅite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno uklonite sve obrisane poruke iz ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Mar_k All Messages as Read"
 msgstr "OznaÄi sve po_ruke kao proÄitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Mark all messages in the folder as read"
 msgstr "OznaÄite sve poruke u fascikli kao proÄitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Create a new folder for storing mail"
 msgstr "Napravite novu fasciklu za smeÅtaj poÅte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Refresh the folder"
 msgstr "OsveÅite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Change the name of this folder"
 msgstr "Promenite ime ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Select Message _Thread"
 msgstr "Izaberi raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Select all messages in the same thread as the selected message"
 msgstr "OznaÄite sve poruke iste rasprave kao izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Select all replies to the currently selected message"
 msgstr "Izaberite sve odgovore na trenutno izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Empty _Trash"
 msgstr "Izbaci _smeÄe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Trajno ukloni sve obrisane poruke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -17256,189 +17338,189 @@ msgstr "_Nova oznaka"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "N_one"
 msgstr "N_iÅta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavi se ili odjavi na fascikle na mreÅnim serverima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Send queued items and retrieve new items"
 msgstr "Åalje pripremljene i dovlaÄi nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Send All"
 msgstr "P_oÅalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Send queued items in all accounts"
 msgstr "PoÅaljite stavke na Äekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "OtkaÅi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Cancel the current mail operation"
 msgstr "OtkaÅite trenutnu operaciju sa poÅtom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "_Message Filters"
 msgstr "F_ilteri poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravite ili uredite pravila za filtriranje nove poÅte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1368
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "F_older"
 msgstr "Fas_cikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "Show Message _Preview"
 msgstr "Prika_Åi pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview pane"
 msgstr "PrikaÅite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Show _Deleted Messages"
 msgstr "PrikaÅi o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Show deleted messages with a line through them"
 msgstr "PrikaÅite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_Group By Threads"
 msgstr "GrupiÅi po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1487
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Show message preview below the message list"
 msgstr "PrikaÅite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview alongside the message list"
 msgstr "PrikaÅite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1523
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1530
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Important Messages"
 msgstr "VaÅne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1537
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1544
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Messages Not Junk"
 msgstr "Poruke nisu Äubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1551
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1558
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Read Messages"
 msgstr "ProÄitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Recent Messages"
 msgstr "SkoraÅnje poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Unread Messages"
 msgstr "NeproÄitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Subject or Addresses contain"
 msgstr "Naslov ili adrese sadrÅe"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1648
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Current Account"
 msgstr "tekuÄem nalogu"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Current Folder"
 msgstr "tekuÄoj fascikli"
 
@@ -17535,7 +17617,7 @@ msgstr "SmeÄe"
 msgid "Send / Receive"
 msgstr "PoÅalji / Primi"
 
-#: ../modules/mail/em-composer-prefs.c:510
+#: ../modules/mail/em-composer-prefs.c:513
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
@@ -17775,7 +17857,7 @@ msgstr ""
 "DobrodoÅli u Evoluciju. Nekoliko narednih ekrana Äe omoguÄiti Evoluciji da "
 "se poveÅe na vaÅe naloge el. poÅte i da uveze datoteke iz drugih programa."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:609
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "UÄitavam naloge..."
 
@@ -18223,13 +18305,6 @@ msgstr "_Adresa :"
 msgid "Use _secure connection"
 msgstr "_Koristi sigurnu vezu"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "KorisniÄko_ime:"
-
 #: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "Po_traÅi kalendar na serveru"
@@ -18256,7 +18331,9 @@ msgid "_Customize options"
 msgstr "_Prilagodi opcije"
 
 #: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
+#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
 #: ../plugins/calendar-file/calendar-file.c:157
@@ -18637,8 +18714,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:828
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Unknown error."
 msgstr "Nepoznata greÅka."
 
@@ -19709,56 +19786,104 @@ msgid ""
 msgstr ""
 "Izabrani spisak veÄ sadrÅi beleÅku â%sâ. Åelite li da uredite staru beleÅku?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:641
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to events. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"Izabrali ste %d poruku da prevedete u dogaÄaje. Da li zaista Åelite sve da "
+"ih dodate?"
+msgstr[1] ""
+"Izabrali ste %d poruke da prevedete u dogaÄaje. Da li zaista Åelite sve da "
+"ih dodate?"
+msgstr[2] ""
+"Izabrali ste %d poruka da prevedete u dogaÄaje. Da li zaista Åelite sve da "
+"ih dodate?"
+msgstr[3] ""
 "Izabrali ste %d poÅta da prevedete u dogaÄaje. Da li zaista Åelite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:644
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to tasks. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"Izabrali ste %d poruku da prevedete u zadatke. Da li zaista Åelite sve da ih "
+"dodate?"
+msgstr[1] ""
+"Izabrali ste %d poruke da prevedete u zadatke. Da li zaista Åelite sve da ih "
+"dodate?"
+msgstr[2] ""
+"Izabrali ste %d poruka da prevedete u zadatke. Da li zaista Åelite sve da ih "
+"dodate?"
+msgstr[3] ""
 "Izabrali ste %d poÅta da prevedete u zadatke. Da li zaista Åelite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:655
 #, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to memos. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] ""
+"Izabrali ste %d poruku da prevedete u beleÅke. Da li zaista Åelite sve da ih "
+"dodate?"
+msgstr[1] ""
+"Izabrali ste %d poruke da prevedete u beleÅke. Da li zaista Åelite sve da ih "
+"dodate?"
+msgstr[2] ""
+"Izabrali ste %d poruka da prevedete u beleÅke. Da li zaista Åelite sve da ih "
+"dodate?"
+msgstr[3] ""
 "Izabrali ste %d poÅta da prevedete u beleÅke. Da li zaista Åelite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:666
+#: ../plugins/mail-to-task/mail-to-task.c:676
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Da li Åelite da nastavite sa prevoÄenjem preostalih poÅta?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:741
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[Bez saÅetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraÄen sa servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "DoÅlo je do greÅke u obradi: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:828
+#: ../plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne mogu da otvorim kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:835
+#: ../plugins/mail-to-task/mail-to-task.c:845
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19766,7 +19891,7 @@ msgstr ""
 "Izabrani izvor je samo za Äitanje, stoga ne moÅete napraviti dogaÄaj. "
 "Izaberite drugi izvor."
 
-#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:848
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19774,7 +19899,7 @@ msgstr ""
 "Izabrani izvor je samo za Äitanje, stoga ne moÅete napraviti zadatak. "
 "Izaberite drugi izvor."
 
-#: ../plugins/mail-to-task/mail-to-task.c:841
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19783,44 +19908,44 @@ msgstr ""
 "Izaberite drugi izvor."
 
 # mail:no-copy-folder-nostore secondary
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Ne mogu da dobavim spisak izvora. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1152
+#: ../plugins/mail-to-task/mail-to-task.c:1162
 msgid "No writable calendar is available."
 msgstr "Nema dostupnog kalendara za upisivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create an _Event"
 msgstr "Napravi _dogaÄaj"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new event from the selected message"
 msgstr "Pravi novi dogaÄaj od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a Mem_o"
 msgstr "Napravi beleÅk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new memo from the selected message"
 msgstr "Pravi novu beleÅku od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
@@ -20843,7 +20968,7 @@ msgstr "Izaberi pregled: %s"
 msgid "Execute these search parameters"
 msgstr "IzvrÅite ove parametre pretrage"
 
-#: ../shell/e-shell-window.c:445
+#: ../shell/e-shell-window.c:487
 msgid "New"
 msgstr "Novo"
 
@@ -20940,19 +21065,20 @@ msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "IskljuÄi okno za pregled poÅte, kontakta i zadataka."
 
 #: ../shell/main.c:334
-msgid "Import URIs or file names given as rest of arguments."
-msgstr "Uvezi adrese datoteka datih kao ostatak argumenata."
+#| msgid "Import URIs or file names given as rest of arguments."
+msgid "Import URIs or filenames given as rest of arguments."
+msgstr "Uvozi adrese datoteka datih kao ostatak argumenata."
 
 # shell:noshell-reason title
 #: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:507 ../shell/main.c:515
+#: ../shell/main.c:510 ../shell/main.c:518
 msgid "- The Evolution PIM and Email Client"
 msgstr "â Evolucija rukovodilac liÄnim podatacima i klijent e-poÅte"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:583
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20961,7 +21087,7 @@ msgstr ""
 "%s: â--onlineâ i â--offlineâ se ne mogu koristiti zajedno.\n"
 "  Pokrenite â%s --helpâ za viÅe podataka.\n"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:589
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21858,10 +21984,6 @@ msgstr "Ne mogu da saÄuvam prilog"
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "_Ime datoteke:"
-
 #: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME tip:"
@@ -21930,40 +22052,40 @@ msgstr[1] "SaÄuvaj priloge"
 msgstr[2] "SaÄuvaj priloge"
 msgstr[3] "SaÄuvaj prilog"
 
-#: ../widgets/misc/e-attachment-view.c:404
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "Otvori drugim programom..."
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../widgets/misc/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "SaÄ_uvaj sve"
 
-#: ../widgets/misc/e-attachment-view.c:437
+#: ../widgets/misc/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../widgets/misc/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../widgets/misc/e-attachment-view.c:468
+#: ../widgets/misc/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "Sak_rij sve"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../widgets/misc/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../widgets/misc/e-attachment-view.c:482
+#: ../widgets/misc/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "Pre_gledaj sve unutar"
 
-#: ../widgets/misc/e-attachment-view.c:803
+#: ../widgets/misc/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Otvori programom â%sâ"
 
-#: ../widgets/misc/e-attachment-view.c:806
+#: ../widgets/misc/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u â%sâ"
@@ -22061,10 +22183,6 @@ msgstr ""
 "Izaberite datoteku koju Åelite da uvezete u Evoluciju i iz liste izaberite "
 "kojeg je tipa ta datoteka."
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "_Ime datoteke:"
-
 #: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Izaberite datoteku"
@@ -22184,7 +22302,7 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolucija trenutno nije na mreÅi jer mreÅa nije dostupna."
 
-#: ../widgets/misc/e-preferences-window.c:279
+#: ../widgets/misc/e-preferences-window.c:308
 msgid "Evolution Preferences"
 msgstr "PodeÅavanja Evolucije"
 
@@ -22759,6 +22877,34 @@ msgstr "Izaberi sve"
 msgid "Input Methods"
 msgstr "Metodi unosa"
 
+#~ msgid "Recent _Documents"
+#~ msgstr "SkoraÅnji _dokumenti"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "Ka_tegorije..."
+
+#~ msgid "never"
+#~ msgstr "nikada"
+
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "Datoteka postoji â{0}â."
+
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "Åelite li da je prepiÅete?"
+
+#~| msgid "C_haracter set:"
+#~ msgid "Character _set:"
+#~ msgstr "Kodni _raspored:"
+
+#~ msgid "cards"
+#~ msgstr "karte"
+
+#~ msgid "File _name:"
+#~ msgstr "_Ime datoteke:"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Ime datoteke:"
+
 #~ msgid "URL:"
 #~ msgstr "Adresa :"
 



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