Updated Serbian translation

author: Мирослав Николић <miroslavnikolic@rocketmail.com> 2012-07-27 17:56:56 +0800
committer: Мирослав Николић <miroslavnikolic@rocketmail.com> 2012-07-27 17:56:56 +0800
commit: e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d (patch)
tree: 65184ed05ba4b7ecfeb3c3e53c62f6b864554f64 /po/sr@latin.po
parent: 3e9527915eb617990a4567d4a3fa3194afc1cf38 (diff)
download: gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar
gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.gz
gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.bz2
gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.lz
gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.xz
gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.zst
gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.zip
1 files changed, 5834 insertions, 8291 deletions
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 47560ec0ab..3b85047762 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -5,14 +5,14 @@
 # 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:570
+#: ../shell/main.c:568
 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-27 11:22+0000\n"
-"PO-Revision-Date: 2012-02-29 11:21+0200\n"
+"POT-Creation-Date: 2012-07-26 00:32+0000\n"
+"PO-Revision-Date: 2012-07-27 11:36+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -90,7 +90,7 @@ msgid "This address book will be removed permanently."
 msgstr "Ovaj adresar će biti trajno uklonjen."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "Ne _briši"
 
@@ -141,7 +141,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid "_Resize"
-msgstr "P_romeni veličinu"
+msgstr "_Promeni veličinu"
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "_Use as it is"
@@ -181,8 +181,8 @@ msgstr ""
 "Kontakt sa ovom adresom već postoji. Želite li ipak da dodate novu kartu sa "
 "istom adresom?"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:601
-#: ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -220,7 +220,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:40
 msgid "Some features may not work properly with your current server"
-msgstr "Neke opcije neće ispravno raditi na vašem trenutnom serveru."
+msgstr "Neke opcije neće ispravno raditi na vašem trenutnom serveru"
 
 #: ../addressbook/addressbook.error.xml.h:41
 msgid ""
@@ -246,7 +246,7 @@ msgstr ""
 "česte kontakte i fascikle sa ličnim kontaktima GroupVajza."
 
 #: ../addressbook/addressbook.error.xml.h:44
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
 msgid "Failed to delete contact"
 msgstr "Nisam uspeo da obrišem kontakt"
 
@@ -268,9 +268,9 @@ msgstr ""
 "adresar sa bočne trake u pregledu Kontakti."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:628
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
@@ -307,14 +307,13 @@ msgid "_Wants to receive HTML mail"
 msgstr "_Želi da prima HTML poštu"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:811
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
-msgstr "E-pošta"
+msgstr "El. pošta"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
@@ -322,10 +321,10 @@ msgstr "Telefon"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Instant Messaging"
-msgstr "Brze poruke"
+msgstr "Trenutne poruke"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:990
+#: ../addressbook/importers/evolution-vcard-importer.c:1002
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -334,9 +333,9 @@ msgid "_Home Page:"
 msgstr "_Lična strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1980
+#: ../modules/itip-formatter/itip-view.c:1822
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
@@ -353,6 +352,7 @@ msgid "Home Page:"
 msgstr "Matična strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/cal-config-google/evolution-cal-config-google.c:98
 msgid "Calendar:"
 msgstr "Kalendar:"
 
@@ -427,10 +427,10 @@ msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
-#: ../calendar/gui/e-calendar-view.c:2076
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:711
+#: ../calendar/gui/e-calendar-view.c:2150
 msgid "Anniversary"
-msgstr "_Godišnjica:"
+msgstr "Godišnjica"
 
 #. XXX Allow the category icons to be referenced as named
 #. *     icons, since GtkAction does not support GdkPixbufs.
@@ -438,11 +438,11 @@ msgstr "_Godišnjica:"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-display.c:728
-#: ../calendar/gui/e-calendar-view.c:2075 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:710
+#: ../calendar/gui/e-calendar-view.c:2149 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:131
 msgid "Birthday"
-msgstr "_Rođendan:"
+msgstr "Rođendan"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
@@ -478,27 +478,27 @@ msgid "_Address:"
 msgstr "_Adresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:82
-#: ../addressbook/gui/widgets/eab-contact-display.c:1360
-#: ../widgets/misc/e-contact-map.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
+#: ../widgets/misc/e-contact-map.c:298
 msgid "Home"
 msgstr "Kuća"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:81
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-#: ../addressbook/gui/widgets/eab-contact-display.c:1357
-#: ../widgets/misc/e-contact-map.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:387
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../widgets/misc/e-contact-map.c:306
 msgid "Work"
 msgstr "Posao"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:83
-#: ../addressbook/gui/widgets/eab-contact-display.c:421
-#: ../calendar/gui/e-cal-model.c:3471
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:71
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:389
+#: ../calendar/gui/e-cal-model.c:3564
 msgid "Other"
 msgstr "Drugo"
 
@@ -510,74 +510,79 @@ msgstr "Adresa stanovanja"
 msgid "Notes"
 msgstr "Napomene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
 msgid "Jabber"
 msgstr "Džaber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:624
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:625
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:623
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:671
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
 msgid "ICQ"
 msgstr "ICKu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
 msgid "GroupWise"
 msgstr "GroupVajz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:626
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:627
+msgid "Twitter"
+msgstr "Tviter"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:497
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:644
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2905
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Uređivač za kontakte — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3386
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3387
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -585,28 +590,28 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3720
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "„%s“ ne može biti budući datum"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3762
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
@@ -618,21 +623,21 @@ msgstr "Brzo dodavanje kontakta"
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:492
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:503
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
 msgid "_Select Address Book"
 msgstr "_Izaberi adresar"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Mr."
-msgstr "G."
+msgstr "G-din"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Mrs."
@@ -640,7 +645,7 @@ msgstr "G-đa"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
 msgid "Ms."
-msgstr "G-đa"
+msgstr "G-din"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "Miss"
@@ -677,7 +682,7 @@ msgstr "Poš."
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Full Name"
-msgstr "Puno ime"
+msgstr "Ime i prezime"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
@@ -696,13 +701,13 @@ msgid "_Suffix:"
 msgstr "_Sufiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:768
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
 msgid "Contact List Editor"
 msgstr "Uređivač kontakt liste"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 msgid "_List name:"
-msgstr "Ime _liste:"
+msgstr "Naziv _liste:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
@@ -710,34 +715,45 @@ msgstr "Članovi"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Upišite elektronsku adresu ili prevucite kontakt u donju listu:"
+msgstr "_Upišite elektronsku adresu ili prevucite kontakt u donji spisak:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
-msgstr "_Sakrij adrese kada šalješ poštu na ovu listu"
+msgstr "_Sakrij adrese kada šalješ poštu na ovna spisku"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-#: ../mail/mail-config.ui.h:156
+msgid "Add an email to the List"
+msgstr "Dodajte el. poštu na spisak"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+msgid "Remove an email address from the List"
+msgstr "Uklonite adresu el. pošte sa spiska"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+msgid "Insert email addresses from Address Book"
+msgstr "Umetnite adrese el. pošte iz adresara"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "_Select..."
-msgstr "Izab_eri..."
+msgstr "_Izaberi..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
 msgid "Contact List Members"
 msgstr "Članovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1409
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
 msgid "_Members"
 msgstr "_Članovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1523
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1538
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1553
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
@@ -751,8 +767,8 @@ msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 msgstr ""
-"Ime ili elektronska adresa ovog kontakta već postoji u ovoj fascikli.  Da li "
-"želite ipak da ga dodate?"
+"Naziv ili el. pošta ovog kontakta već postoji u ovoj fascikli. Da li želite "
+"ipak da ga dodate?"
 
 #. Translators: Heading of the contact which has same name or email address in this folder already.
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
@@ -764,17 +780,17 @@ msgid "Changed Contact:"
 msgstr "Izmenjen kontakt:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:338
+#: ../addressbook/gui/merging/eab-contact-merging.c:342
 msgid "_Merge"
-msgstr "_Pripoji"
+msgstr "_Stopi"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Ime ili elektronska adresa ovog kontakta već postoji\n"
-"u ovoj fascikli.  Da li želite ipak da  ga dodate?"
+"Naziv ili elektronska adresa ovog kontakta već postoji\n"
+"u ovoj fascikli. Da li želite ipak da  ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
 msgid "Original Contact:"
@@ -784,27 +800,27 @@ msgstr "Originalan kontakt:"
 msgid "New Contact:"
 msgstr "Novi kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:320
+#: ../addressbook/gui/merging/eab-contact-merging.c:324
 msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1060
 msgid "Name contains"
-msgstr "Ime sadrži"
+msgstr "Naziv sadrži"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1053
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
@@ -816,122 +832,125 @@ msgstr "Polje koje sadrži"
 # note(slobo): filter, filter -->  propusnik, proba na par mesta
 # note(slobo): address book, adresar --> imenik na par mesta proba
 # note(slobo): spam , Đubre --> Neželjena pošta
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
 #: ../addressbook/gui/widgets/ea-minicard-view.c:189
 msgid "evolution address book"
 msgstr "Adresar Evolucije"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
 msgid "Copy _Email Address"
 msgstr "Umnoži elektronsku _adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:164
+#: ../widgets/misc/e-web-view.c:300 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "Umnožava adrese u spisak isečaka"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../widgets/misc/e-web-view.c:305 ../widgets/misc/e-web-view-gtkhtml.c:434
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../widgets/misc/e-web-view.c:307 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "Send a mail message to this address"
 msgstr "Šalje poruku na ovu adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:324
+#: ../widgets/misc/e-web-view.c:1087 ../widgets/misc/e-web-view-gtkhtml.c:973
+#, c-format
+msgid "Click to mail %s"
+msgstr "Kliknite da pošaljete %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:159
 msgid "Open map"
 msgstr "Otvorite mapu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:554
 msgid "List Members:"
 msgstr "Članovi liste:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Preduzeće"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
 msgid "Department"
-msgstr "_Odeljenje:"
+msgstr "Odeljenje"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 msgid "Profession"
-msgstr "_Zanimanje:"
+msgstr "Zanimanje"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Pomoćnik"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
 msgid "Video Chat"
-msgstr "_Video razgovor:"
+msgstr "Video razgovor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
-#: ../calendar/gui/dialogs/calendar-setup.c:469
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:528
-#: ../modules/online-accounts/e-online-accounts-google.c:302
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:678
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:626
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 #: ../calendar/gui/dialogs/event-editor.c:127
 #: ../calendar/gui/dialogs/event-editor.c:354
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
-#: ../addressbook/gui/widgets/eab-contact-display.c:725
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../addressbook/gui/widgets/eab-contact-display.c:727
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
 msgid "Address"
 msgstr "Adresa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
 msgid "Home Page"
-msgstr "_Lična strana:"
+msgstr "Matična stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
 msgid "Web Log"
-msgstr "_Veb log:"
+msgstr "Veb log"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:708
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:712
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Supružnik"
@@ -939,51 +958,32 @@ msgstr "Supružnik"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:732
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:126
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:144
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:132
-#: ../modules/calendar/e-memo-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-backend.c:128
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:722
 msgid "Personal"
 msgstr "Lično"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:746
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Napomena"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "List Members"
 msgstr "Članovi liste"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
 msgid "Job Title"
 msgstr "Zvanje na poslu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
 msgid "Home page"
-msgstr "Lična stranica"
+msgstr "Matična stranica:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Kliknite da pošaljete %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -993,7 +993,7 @@ msgstr ""
 "korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte "
 "adresar kada se povežete radi preuzimanja njegovog sadržaja."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1002,7 +1002,7 @@ msgstr ""
 "Ne mogu da otvorim ovaj adresar.  Proverite da li postoji putanja %s i da li "
 "imate prava pristupa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:156
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1011,7 +1011,7 @@ msgstr ""
 "koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
 "podrškom za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1019,11 +1019,11 @@ msgstr ""
 "Ne mogu da otvorim ovaj adresar.  To znači da ste ili uneli pogrešnu adresu, "
 "ili je server nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "Detailed error message:"
 msgstr "Detalji greške:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1035,7 +1035,7 @@ msgstr ""
 "Preciznije oblikujte upit ili povećajte ograničenje\n"
 "broja rezultata u postavkama adresara za server direktorijuma."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1048,58 +1048,58 @@ msgstr ""
 "direktorijuma za ovaj adresar."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../addressbook/gui/widgets/eab-gui-util.c:225
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
 #: ../addressbook/gui/widgets/eab-gui-util.c:242
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Ovaj upit nije uspešno završen. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:270
+#: ../addressbook/gui/widgets/eab-gui-util.c:264
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Select Address Book"
 msgstr "Izaberi adresar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:390
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "list"
-msgstr "lista"
+msgstr "spisak"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:577
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
 msgid "Copy contact to"
 msgstr "Umnoži kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:580
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:582
+#: ../addressbook/gui/widgets/eab-gui-util.c:593
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:164
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:168
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -1108,11 +1108,11 @@ msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 msgstr[3] "jedan kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:363
+#: ../addressbook/gui/widgets/e-addressbook-model.c:371
 msgid "Error getting book view"
 msgstr "Greška pri učitavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:752
+#: ../addressbook/gui/widgets/e-addressbook-model.c:805
 msgid "Search Interrupted"
 msgstr "Pretraga je prekinuta"
 
@@ -1120,55 +1120,55 @@ msgstr "Pretraga je prekinuta"
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Cut selected contacts to the clipboard"
 msgstr "Seče označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Copy selected contacts to the clipboard"
 msgstr "Umnožava označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../addressbook/gui/widgets/e-addressbook-view.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:864
 msgid "Delete selected contacts"
 msgstr "Briše izabrane kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:664
+#: ../addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Select all visible contacts"
 msgstr "Označava sve vidljive kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sigurno želite da obrišete ove liste kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact list?"
-msgstr "Sigurno želite da obrišete ovu listu kontakta?"
+msgstr "Sigurno želite da obrišete ovaj spisak kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Sigurno želite da obrišete ovu listu kontakta (%s) ?"
+msgstr "Sigurno želite da obrišete ovaj spisak kontakta (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sigurno želite da obrišete ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sigurno želite da obrišete ovaj kontakt?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sigurno želite da obrišete ovaj kontakt (%s) ?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1189,17 +1189,17 @@ msgstr[3] ""
 "Otvaranje jednog kontakta će takođe otvoriti jedan novi prozor.\n"
 "Da li zaista želite da prikažete sve ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
 msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "File As"
-msgstr "Smesti kao"
+msgstr "Zavedi kao"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Given Name"
@@ -1211,11 +1211,11 @@ msgstr "Prezime"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
-msgstr "E-pošta 2"
+msgstr "2. elektronska adresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Email 3"
-msgstr "E-pošta 3"
+msgstr "3. elektronska adresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Assistant Phone"
@@ -1227,7 +1227,7 @@ msgstr "Telefon na poslu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
-msgstr "Telefon na poslu 2"
+msgstr "2. telefon na poslu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Business Fax"
@@ -1251,7 +1251,7 @@ msgstr "Kućni telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Phone 2"
-msgstr "Kućni telefon 2"
+msgstr "2. kućni telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
@@ -1308,7 +1308,7 @@ msgid "Title"
 msgstr "Titula"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:653
+#: ../calendar/gui/e-meeting-list-view.c:657
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Uloga"
@@ -1335,7 +1335,7 @@ msgstr "Otvori"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
-msgstr "Lista kontakta: "
+msgstr "Spisak kontakta: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
@@ -1362,20 +1362,20 @@ msgstr[1] "trenutna fascikla adresara %s ima %d karte"
 msgstr[2] "trenutna fascikla adresara %s ima %d karti"
 msgstr[3] "trenutna fascikla adresara %s ima jednu kartu"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Work Email"
-msgstr "Poslovna e-pošta"
+msgstr "Poslovna el. pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:94
 msgid "Home Email"
-msgstr "Kućna e-pošta"
+msgstr "Kućna el. pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:795
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:775
 msgid "Other Email"
-msgstr "Druga e-pošta"
+msgstr "Druga el. pošta"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1385,7 +1385,7 @@ msgstr ""
 "\n"
 "Tražim kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1399,7 +1399,7 @@ msgstr ""
 "\n"
 "ili kliknite dvaput ovde da napravite novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:199
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1413,7 +1413,7 @@ msgstr ""
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1423,7 +1423,7 @@ msgstr ""
 "\n"
 "Pretraga za kontaktima."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:205
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1437,87 +1437,87 @@ msgstr ""
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:415
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../calendar/importers/icalendar-importer.c:944 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-vcard-importer.c:279
+#: ../calendar/importers/icalendar-importer.c:446
+#: ../calendar/importers/icalendar-importer.c:939
+#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Uvozim..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1075
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1076
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1102
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1103
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:796
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:797
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "Evolution LDIF importer"
 msgstr "Evolucijin LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:657
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:668
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin vKart uvoznik"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:723
+#: ../addressbook/printing/e-contact-print.c:717
 #, c-format
 msgid "Page %d"
-msgstr "%d° stranica"
+msgstr "%d. stranica"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "List local address book folders"
 msgstr "Navodi fascikle lokalnog adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "Show cards as vcard or csv file"
 msgstr "Prikazuje karte kao vkartu ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:69
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
+#: ../addressbook/tools/evolution-addressbook-export.c:72
 msgid "Export in asynchronous mode"
 msgstr "Izvozi u neusklađenom režimu"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:74
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1525,63 +1525,45 @@ msgstr ""
 "Broj karti u jednoj izlaznoj datoteci u neusklađenom režimu, podrazumevana "
 "veličina je 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:76
+#: ../addressbook/tools/evolution-addressbook-export.c:77
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:149
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Greška u argumentima naredbe, koristite opciju „--help“ da vidite kako se "
 "koristi."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv ili vkard oblik."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
+#: ../addressbook/tools/evolution-addressbook-export.c:172
 msgid "In async mode, output must be file."
 msgstr "U neusklađenom režimu, izlaz mora biti datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:170
+#: ../addressbook/tools/evolution-addressbook-export.c:180
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom režimu, nema potrebe za podešavanjem veličine."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:201
+#: ../addressbook/tools/evolution-addressbook-export.c:213
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "Ne mogu da otvorim datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "Ne mogu da dobavim listu adresara: %s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:2330
-#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
-#: ../plugins/caldav/caldav-browse-server.c:221
-#: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1485
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Nisam uspeo da otvorim „%s“: %s"
 
-# bug: plural-forms
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -1589,7 +1571,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -1600,8 +1582,8 @@ msgstr[3] "sat"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -1609,7 +1591,7 @@ msgstr[1] "dana"
 msgstr[2] "dana"
 msgstr[3] "dan"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
 msgid "Start time"
 msgstr "Vreme početka"
 
@@ -1618,77 +1600,78 @@ msgid "Appointments"
 msgstr "Zakazivanja"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "Zanemari _sve"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
-msgstr "Dre_manje"
+msgstr "_Dremanje"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3 ../e-util/e-alert-dialog.c:164
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../libevolution-utils/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Zanemari"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1449
+#: ../modules/itip-formatter/itip-view.c:1549
+msgid "Location:"
+msgstr "Mesto:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "mesto sastanka"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 msgid "Snooze _time:"
 msgstr "Vreme _dremanja:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "dana"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:7
-#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
+#: ../widgets/misc/e-interval-chooser.c:141
 msgid "hours"
 msgstr "sati"
 
-# bug: plural-forms
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/google-account-setup/google-contacts-source.c:386
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../mail/e-mail-config-provider-page.c:527
+#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "zakazana lokacija"
-
-#. Location
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1758
-#: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1051
-msgid "Location:"
-msgstr "Lokacija:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "Zanemari _sve"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1607
-#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
 msgid "No summary available."
 msgstr "Nema dostupnog sažetka."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1616
-#: ../calendar/alarm-notify/alarm-queue.c:1618
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o lokaciji."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/alarm-notify/alarm-queue.c:1672
+#: ../calendar/alarm-notify/alarm-queue.c:1669
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1697,12 +1680,12 @@ msgstr[1] "Imate %d potsetnika"
 msgstr[2] "Imate %d potsetnika"
 msgstr[3] "Imate jedan potsetnik"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1872
-#: ../calendar/alarm-notify/alarm-queue.c:1907
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1876
+#: ../calendar/alarm-notify/alarm-queue.c:1869
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1710,11 +1693,11 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 "Evolucija još uvek ne podržava kalendarske podsetnike\n"
-"sa obaveštenjima putem e-pošte, ali ovaj podsetnik\n"
-"je podešen da pošalje poruku. Evolucija će\n"
+"sa obaveštenjima putem el. pošte, ali ovaj podsetnik\n"
+"je podešen da pošalje poruku.  Evolucija će\n"
 "umesto toga prikazati normalno prozorče."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1913
+#: ../calendar/alarm-notify/alarm-queue.c:1906
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1731,17 +1714,17 @@ msgstr ""
 "\n"
 "Da li ste sigurni da želite da pokrenete ovaj program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1928
+#: ../calendar/alarm-notify/alarm-queue.c:1921
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "neispravno vreme"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
-#: ../calendar/gui/misc.c:116
+#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:96
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1751,8 +1734,8 @@ msgstr[2] "%d sati"
 msgstr[3] "Jedan sat"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:377
-#: ../calendar/gui/misc.c:122
+#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
+#: ../calendar/gui/misc.c:102
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1764,8 +1747,8 @@ msgstr[3] "Jedan minut"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
-#: ../calendar/gui/misc.c:126
+#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:106
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1965,7 +1948,7 @@ msgstr "Želite li da pošaljete učesnicima pozive na sastanak?"
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
-"Pozivnice će biti poslate e-poštom svim učesnicima i omogućiće im da "
+"Pozivnice će biti poslate el. poštom svim učesnicima i omogućiće im da "
 "odgovore."
 
 #: ../calendar/calendar.error.xml.h:40
@@ -1995,8 +1978,8 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
-"Pozivnice e-poštom biće poslate svim učesnicima da bi mogli da prihvate ovaj "
-"zadatak."
+"Pozivnice el. poštom biće poslate svim učesnicima da bi mogli da prihvate "
+"ovaj zadatak."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
@@ -2011,6 +1994,7 @@ msgstr ""
 "prilozi neće biti sačuvani sa njim."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+#: ../modules/itip-formatter/itip-view.c:3057
 msgid "_Save"
 msgstr "_Sačuvaj"
 
@@ -2203,6 +2187,14 @@ msgstr ""
 "Povezujete se na nepodržan GroupVajz server što može da dovede do problema u "
 "radu Evolucije. Najbolje je da server bude nadograđen na podržanu verziju."
 
+#: ../calendar/calendar.error.xml.h:91
+msgid "Could not perform this operation."
+msgstr "Ne mogu da izvršim radnju."
+
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:169
+msgid "You must be working online to complete this operation."
+msgstr "Morate da budete na mreži da biste završili ovu radnju."
+
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
 msgstr "Dnevni pregled"
@@ -2223,7 +2215,7 @@ msgstr "Mesečni pregled"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "Sažetak"
 
@@ -2264,20 +2256,20 @@ msgstr "je"
 msgid "is not"
 msgstr "nije"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
+#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Javno"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Lično"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
 #: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Poverljivo"
@@ -2295,9 +2287,9 @@ msgstr "Učesnik"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:861
+#: ../plugins/publish-calendar/publish-calendar.c:872
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Mesto"
 
@@ -2307,7 +2299,9 @@ msgid "Category"
 msgstr "Kategorija"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:198
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Prilozi"
 
@@ -2326,7 +2320,7 @@ msgstr "Ne postoji"
 #: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
-msgstr "Učestalost"
+msgstr "Ponavljanje"
 
 #: ../calendar/gui/caltypes.xml.h:20
 msgid "Occurs"
@@ -2359,22 +2353,22 @@ msgid "Edit Reminder"
 msgstr "Uredi podsetnik"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:413
+#: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Iskačuće upozorenje"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:824
-#: ../calendar/gui/e-alarm-list.c:409
+#: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Pušta zvuk"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:825
-#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Pokreće program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:826
-#: ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Šalje elektronsku poruku"
 
@@ -2429,9 +2423,9 @@ msgstr "Po_novi podsetnik"
 msgid "extra times every"
 msgstr "prikaži još na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
 msgid "Options"
-msgstr "Opcije"
+msgstr "Mogućnosti"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom _message"
@@ -2451,7 +2445,7 @@ msgstr "_Zvuk:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "Select A File"
-msgstr "Izaberi datoteku"
+msgstr "Izaberite datoteku"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "_Program:"
@@ -2465,7 +2459,7 @@ msgstr "_Argumenti:"
 msgid "Send To:"
 msgstr "Pošalji:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
 msgid "Action/Trigger"
 msgstr "Radnja/pokretač"
 
@@ -2479,88 +2473,6 @@ msgstr "Podsetnici"
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "Tip:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:529
-msgid "_Type:"
-msgstr "_Tip:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:286
-msgid "_Name:"
-msgstr "_Ime:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "_Umnožava sadržaj kalendara lokalno za rad van mreže"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:318
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "_Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:320
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "_Umnožava sadržaj spiska beleški lokalno za rad van mreže"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-msgid "Sh_ow reminder notifications"
-msgstr "Prikaži _obaveštenja podsetnika"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:445
-msgid "Colo_r:"
-msgstr "Boj_a:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:468
-#: ../calendar/gui/dialogs/calendar-setup.c:480
-#: ../calendar/gui/dialogs/calendar-setup.c:491
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
-#: ../modules/addressbook/addressbook-config.c:1114
-#: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3240
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "Opšte"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:481
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "Spisak zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:492
-msgid "Memo List"
-msgstr "Spisak beleški"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "Calendar Properties"
-msgstr "Osobine kalendara"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "New Calendar"
-msgstr "Novi kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "Task List Properties"
-msgstr "Osobine spiska zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "New Task List"
-msgstr "Novi spisak zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "Memo List Properties"
-msgstr "Osobine spiska zadataka"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "New Memo List"
-msgstr "Novi spisak beleške"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
@@ -2606,239 +2518,249 @@ 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:279
+#: ../calendar/gui/dialogs/comp-editor.c:278
 msgid "Could not save attachments"
 msgstr "Ne mogu da sačuvam priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:629
 msgid "Could not update object"
 msgstr "Ne mogu da osvežim objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:763
 msgid "Edit Appointment"
 msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazivanje — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:778
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljen zadatak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Memo - %s"
 msgstr "Beleška — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:801
 msgid "No Summary"
 msgstr "Bez sažetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:912
+#: ../calendar/gui/dialogs/comp-editor.c:922
 msgid "Keep original item?"
 msgstr "Zadržati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
+#: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1413
+#: ../widgets/misc/e-web-view-gtkhtml.c:456
+#: ../widgets/misc/e-web-view-gtkhtml.c:1299
 msgid "Copy the selection"
 msgstr "Umnožite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1300
+#: ../widgets/misc/e-web-view.c:1407 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "Obrišite izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "View help"
 msgstr "Pogledaj pomoć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1312
+#: ../widgets/misc/e-web-view.c:1419 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Save current changes"
 msgstr "Sačuvajte tekuće izmene"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1586
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+msgid "Save and Close"
+msgstr "Sačuvaj i zatvori"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1220
+msgid "Save current changes and close editor"
+msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1558
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1234
 msgid "_Classification"
-msgstr "Ozna_ka"
+msgstr "_Razvrstavanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:172
+#: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/misc/e-signature-editor.c:225
+#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1593
+#: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_File"
-msgstr "Dato_teka"
+msgstr "_Datoteka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1255
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
-msgstr "_Pomoć"
+msgstr "Po_moć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
-msgstr "_Opcije"
+msgstr "_Mogućnosti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
+#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 #: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Categories"
-msgstr "Ka_tegorije"
+msgstr "_Kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether to display categories"
 msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1267
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1317
 msgid "Classify as public"
 msgstr "Označite kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "Classify as private"
 msgstr "Označite kao lično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 msgid "Classify as confidential"
 msgstr "Označite kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "R_ole Field"
 msgstr "Polje _uloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "Toggles whether the Role field is displayed"
 msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1308
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 msgid "_RSVP"
 msgstr "_Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1355
 msgid "_Status Field"
 msgstr "Polje _stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "Toggles whether the Status field is displayed"
 msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "_Type Field"
 msgstr "Polje _tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1365
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2393
-#: ../calendar/gui/dialogs/comp-editor.c:2556
-#: ../calendar/gui/dialogs/comp-editor.c:3548
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
 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:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../calendar/gui/dialogs/comp-editor.c:3615
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3580
+#: ../calendar/gui/dialogs/comp-editor.c:3683
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim trenutno izdanje!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#: ../calendar/gui/dialogs/comp-editor-page.c:439
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
@@ -2994,13 +2916,13 @@ msgstr "S_lobodno/zauzeto:"
 msgid "Query free / busy information for the attendees"
 msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3327
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
 msgid "Appointment"
 msgstr "Zakazivanje"
 
 #: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:166
 msgid "Attendees"
 msgstr "Učesnici"
 
@@ -3008,93 +2930,80 @@ msgstr "Učesnici"
 msgid "Print this event"
 msgstr "Štampajte ovu poruku"
 
-#: ../calendar/gui/dialogs/event-page.c:566
+#: ../calendar/gui/dialogs/event-page.c:570
 msgid "Event's start time is in the past"
 msgstr "Početak događaja je u prošlosti"
 
-#: ../calendar/gui/dialogs/event-page.c:643
+#: ../calendar/gui/dialogs/event-page.c:647
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Događaj nije moguće uređivati, pošto je izabrani kalendar samo za čitanje"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:651
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Događaj nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/dialogs/event-page.c:659
-#: ../calendar/gui/dialogs/event-page.c:3101
+#: ../calendar/gui/dialogs/event-page.c:663
+#: ../calendar/gui/dialogs/event-page.c:3138
 msgid "This event has reminders"
 msgstr "Ovaj događaj ima podsetnike"
 
-#: ../calendar/gui/dialogs/event-page.c:726
+#: ../calendar/gui/dialogs/event-page.c:730
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1285
+#: ../calendar/gui/dialogs/event-page.c:1296
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:1288
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
-#: ../calendar/gui/dialogs/memo-page.c:723
-#: ../calendar/gui/dialogs/task-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "Datum početka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/event-page.c:1482
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1505
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/event-page.c:1512
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1664
-#: ../calendar/gui/dialogs/memo-page.c:762
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1698
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1709
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1905
+#: ../calendar/gui/dialogs/event-page.c:1916
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:1907
+#: ../calendar/gui/dialogs/event-page.c:1918
 msgid "Atte_ndees"
 msgstr "Uč_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2993
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Ne mogu da otvorim kalendar „%s“ : %s"
 
-#. Translators: This string is used when we are creating an Event
-#. * (meeting or appointment)  on behalf of some other user
-#. Translators: This string is used when we are creating a Memo
-#. * on behalf of some other user
-#. Translators: This string is used when we are creating a Task
-#. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:3019
-#: ../calendar/gui/dialogs/memo-page.c:1025
-#: ../calendar/gui/dialogs/task-page.c:1858
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr "Delujete u ime %s"
-
-#: ../calendar/gui/dialogs/event-page.c:3361
+#: ../calendar/gui/dialogs/event-page.c:3409
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3103,7 +3012,7 @@ msgstr[1] "%d dana pre zakazanog"
 msgstr[2] "%d dana pre zakazanog"
 msgstr[3] "%d dan pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:3367
+#: ../calendar/gui/dialogs/event-page.c:3415
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3112,7 +3021,7 @@ msgstr[1] "%d sata pre zakazanog"
 msgstr[2] "%d sati pre zakazanog"
 msgstr[3] "%d sat pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:3373
+#: ../calendar/gui/dialogs/event-page.c:3421
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3121,7 +3030,7 @@ msgstr[1] "%d minuta pre zakazanog"
 msgstr[2] "%d minuta pre zakazanog"
 msgstr[3] "%d minut pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:3392
+#: ../calendar/gui/dialogs/event-page.c:3440
 msgid "Customize"
 msgstr "Prilagodi"
 
@@ -3131,7 +3040,7 @@ msgstr "Prilagodi"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3398
+#: ../calendar/gui/dialogs/event-page.c:3446
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ništa"
@@ -3167,9 +3076,8 @@ msgid "1 day before appointment"
 msgstr "1 dan pre zakazanog sastanka"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
-msgstr "_Lokacija:"
+msgstr "_Mesto:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
@@ -3263,11 +3171,11 @@ msgid "Select Date"
 msgstr "Izaberite datum"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Select _Today"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
 msgid "Memo"
 msgstr "Beleška"
 
@@ -3275,38 +3183,53 @@ msgstr "Beleška"
 msgid "Print this memo"
 msgstr "Štampajte ovu belešku"
 
-#: ../calendar/gui/dialogs/memo-page.c:423
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo's start date is in the past"
 msgstr "Početak beleške je u prošlosti"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../calendar/gui/dialogs/memo-page.c:465
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Belešku nije moguće uređivati, pošto je izabran spisak samo za čitanje"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
+#: ../calendar/gui/dialogs/memo-page.c:469
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Belešku nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/memo-page.c:981
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Ne mogu da otvorim beleške u „%s“ : %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2667
-#: ../mail/em-format-html.c:2732 ../mail/em-format-html.c:2756
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:983
+#: ../em-format/e-mail-parser-application-mbox.c:111
+#: ../em-format/e-mail-parser-application-smime.c:107
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
+#: ../em-format/e-mail-parser-multipart-encrypted.c:122
+#: ../em-format/e-mail-parser-multipart-signed.c:147
+#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
+#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4494
+#: ../modules/itip-formatter/itip-view.c:4892 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:317
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
+#: ../calendar/gui/dialogs/memo-page.c:1173
+#: ../em-format/e-mail-formatter.c:1364
+#: ../em-format/e-mail-formatter-utils.c:180
+#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
 msgid "To"
 msgstr "Prima"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.c:346
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Spisak:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.c:354
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
@@ -3361,21 +3284,21 @@ msgstr "Ovaj i buduće unose"
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:576
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:969
 msgid "Recurrence date is invalid"
 msgstr "Datum ponavljanja nije ispravan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "End time of the recurrence was before event's start"
 msgstr "Vreme završetka ponavljanja je pre početka događaja"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "on"
 msgstr "u"
 
@@ -3383,7 +3306,7 @@ msgstr "u"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "first"
 msgstr "prvom"
 
@@ -3392,7 +3315,7 @@ msgstr "prvom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "second"
 msgstr "drugom"
 
@@ -3400,7 +3323,7 @@ msgstr "drugom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "third"
 msgstr "trećem"
 
@@ -3408,7 +3331,7 @@ msgstr "trećem"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fourth"
 msgstr "četvrtom"
 
@@ -3416,7 +3339,7 @@ msgstr "četvrtom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "fifth"
 msgstr "petom"
 
@@ -3424,13 +3347,13 @@ msgstr "petom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
 msgid "last"
 msgstr "poslednjem"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1148
+#: ../calendar/gui/dialogs/recurrence-page.c:1152
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -3438,7 +3361,7 @@ msgstr "Drugi datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1158
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -3446,7 +3369,7 @@ msgstr "od prvog do desetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -3454,41 +3377,41 @@ msgstr "od jedanaestog do dvadesetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Nedelja"
@@ -3496,31 +3419,31 @@ msgstr "Nedelja"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1322
+#: ../calendar/gui/dialogs/recurrence-page.c:1326
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1501
+#: ../calendar/gui/dialogs/recurrence-page.c:1505
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2217
+#: ../calendar/gui/dialogs/recurrence-page.c:2221
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2258
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to modify."
 msgstr "Ne mogu da nađem izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2264
+#: ../calendar/gui/dialogs/recurrence-page.c:2268
 msgid "Modify exception"
 msgstr "Izmenite izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2308
+#: ../calendar/gui/dialogs/recurrence-page.c:2312
 msgid "Could not get a selection to delete."
 msgstr "Ne mogu da nađem izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2447
+#: ../calendar/gui/dialogs/recurrence-page.c:2451
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -3578,7 +3501,7 @@ msgstr "Svakih"
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "Preview"
 msgstr "Pregled"
 
@@ -3601,16 +3524,16 @@ msgstr "Veb stranica"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
 #: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "Visok"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:328
-#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
 #: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
@@ -3618,63 +3541,61 @@ msgstr "Običan"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:330
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "Nizak"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Neodređen"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:490
-#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:489
+#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Nije započet"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:301
-#: ../calendar/gui/e-cal-model-tasks.c:492
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
-#: ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
+#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3408
 msgid "In Progress"
 msgstr "U toku"
 
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:494
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
-#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "Završeno"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../calendar/gui/e-cal-model-tasks.c:496
-#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
-#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
+#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:869
 msgid "Canceled"
 msgstr "Otkazano"
 
@@ -3682,13 +3603,13 @@ msgstr "Otkazano"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3522
-#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-cal-model.c:3618
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
-msgstr "Status"
+msgstr "Stanje"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 msgid "Stat_us:"
@@ -3713,7 +3634,7 @@ msgstr "_Veb stranica:"
 
 #: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
-msgstr "Det_alji statusa"
+msgstr "Detalji _stanja"
 
 #: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
@@ -3721,38 +3642,38 @@ msgstr "Kliknite da izmenite ili da pregledate detalje statusa zadatka"
 
 #: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
-msgstr "Mog_ućnosti slanja"
+msgstr "Mogućnosti _slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
+#: ../calendar/gui/dialogs/task-editor.c:307
 msgid "Task Details"
 msgstr "Detalji zadatka"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:351
 msgid "Print this task"
 msgstr "Odštampajte ovaj zadatak"
 
-#: ../calendar/gui/dialogs/task-page.c:254
+#: ../calendar/gui/dialogs/task-page.c:259
 msgid "Task's start date is in the past"
 msgstr "Početak zadatka je u prošlosti"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:260
 msgid "Task's due date is in the past"
 msgstr "Rok za završetak zadatka je u prošlosti"
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Zadatak nije moguće uređivati, pošto je izabrani spisak samo za čitanje"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:297
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Zadatak nije moguće potpuno urediti, zato što niste organizator"
 
-#: ../calendar/gui/dialogs/task-page.c:297
+#: ../calendar/gui/dialogs/task-page.c:301
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3760,18 +3681,18 @@ msgstr ""
 "Zadatak nije moguće uređivati, zato što izabrani spisak zadataka ne podržava "
 "dodeljene zadatke"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "Krajnji rok je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:1777
+#: ../calendar/gui/dialogs/task-page.c:1813
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Ne mogu da otvorim zadatke u „%s“ : %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
-msgstr "Kra_jnji rok:"
+msgstr "Krajnji _rok:"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
@@ -3870,14 +3791,14 @@ msgstr "pregled kalendara za jedan ili više dana"
 msgid "a table to view and select the current time range"
 msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
 
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:1118
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1086
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3892,30 +3813,30 @@ 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:1850
-#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1099
+#: ../modules/calendar/e-cal-shell-view-private.c:1102
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../modules/calendar/e-cal-shell-view-private.c:1119
+#: ../modules/calendar/e-cal-shell-view-private.c:1130
+#: ../modules/calendar/e-cal-shell-view-private.c:1137
+#: ../modules/calendar/e-cal-shell-view-private.c:1140
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3928,10 +3849,10 @@ 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:1866
-#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1868
+#: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1126
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -3944,7 +3865,7 @@ msgid "Click here, you can find more events."
 msgstr "Kliknite ovde, možete naći još događaja."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:359
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3954,7 +3875,7 @@ msgstr[2] "%d dana"
 msgstr[3] "%d dan"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:365
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3963,62 +3884,62 @@ msgstr[1] "%d nedelje"
 msgstr[2] "%d nedelja"
 msgstr[3] "%d nedelja"
 
-#: ../calendar/gui/e-alarm-list.c:427
+#: ../calendar/gui/e-alarm-list.c:426
 msgid "Unknown action to be performed"
 msgstr "Izvršiće se nepoznata radnja"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pre početka sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:445
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon početka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:452
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pre kraja sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:469
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:500
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at %s"
 msgstr "%s u %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:508
+#: ../calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
@@ -4041,42 +3962,47 @@ msgstr "pregled kalendara za mesec"
 msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili više nedelja"
 
-#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:206 ../filter/e-filter-rule.c:748
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:214
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:245
 msgid "Summary:"
 msgstr "Sažetak:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:264
+msgid "End Date:"
+msgstr "Datum završetka:"
+
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "Krajnji rok:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../plugins/itip-formatter/itip-view.c:1082
+#: ../calendar/gui/e-cal-component-preview.c:286
+#: ../modules/itip-formatter/itip-view.c:1452
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "Status:"
-msgstr "Status:"
+msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "Važnost:"
 
-#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:366
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
@@ -4089,19 +4015,19 @@ msgid "Start date"
 msgstr "Datum početka"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-list-view.c:644
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
 #: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:871
 msgid "Complete"
 msgstr "Završeno"
 
@@ -4116,14 +4042,14 @@ msgstr "% je završeno"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "Važnost"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "Napravljeno"
 
@@ -4133,37 +4059,37 @@ msgstr "Napravljeno"
 msgid "Last modified"
 msgstr "Poslednje izmene"
 
-#: ../calendar/gui/e-calendar-view.c:427
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Cut selected events to the clipboard"
 msgstr "Seče izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:433
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Copy selected events to the clipboard"
 msgstr "Umnožava izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:439
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Paste events from the clipboard"
 msgstr "Ubacuje događaje iz spiska isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Delete selected events"
 msgstr "Briše izabrane događaje"
 
-#: ../calendar/gui/e-calendar-view.c:464 ../calendar/gui/e-memo-table.c:198
-#: ../calendar/gui/e-task-table.c:286
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
+#: ../calendar/gui/e-task-table.c:283
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: ../calendar/gui/e-calendar-view.c:660 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
+#: ../calendar/gui/e-task-table.c:1158
 msgid "Updating objects"
 msgstr "Ažuriram objekat"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1918 ../calendar/gui/e-memo-table.c:555
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:824
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -4171,20 +4097,20 @@ msgstr "Organizator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1922 ../calendar/gui/e-memo-table.c:560
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:828
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1938 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1969
+#: ../calendar/gui/e-calendar-view.c:2043
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -4198,86 +4124,86 @@ msgstr "Datum početka"
 msgid "End Date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
-#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
+#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3441
+#: ../modules/itip-formatter/itip-view.c:5972
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:2885
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1625
+#: ../calendar/gui/e-cal-model.c:1657
 msgid "Recurring"
-msgstr "Ponovno"
+msgstr "Periodičnost"
 
-#: ../calendar/gui/e-cal-model.c:1627
+#: ../calendar/gui/e-cal-model.c:1659
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:1062
+#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1075
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:211
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:3021
+#: ../calendar/gui/e-cal-model.c:3114
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram „%s“"
 
-#: ../calendar/gui/e-cal-model.c:3466
-#: ../calendar/gui/e-meeting-list-view.c:218
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2873
+#: ../calendar/gui/e-cal-model.c:3559
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../modules/itip-formatter/itip-view.c:5960
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-cal-model.c:3467
-#: ../calendar/gui/e-meeting-list-view.c:219
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2879
+#: ../calendar/gui/e-cal-model.c:3560
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:5966
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-cal-model.c:3468
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-cal-model.c:3561
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-cal-model.c:3469
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2882
+#: ../calendar/gui/e-cal-model.c:3562
+#: ../calendar/gui/e-meeting-list-view.c:225
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../modules/itip-formatter/itip-view.c:5969
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-cal-model.c:3470
+#: ../calendar/gui/e-cal-model.c:3563
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
 #: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/e-task-table.c:633
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:720
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4293,7 +4219,7 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-cal-model-tasks.c:772
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ništa"
@@ -4303,7 +4229,7 @@ msgstr "Ništa"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4312,11 +4238,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:166
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:174
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4326,16 +4252,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../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
+#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
+#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../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
+#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
+#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
 msgstr "pop"
 
@@ -4350,16 +4276,16 @@ 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:1833 ../calendar/gui/e-day-view-top-item.c:833
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+#: ../calendar/gui/e-day-view.c:1835 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 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:2650
+#: ../calendar/gui/e-day-view.c:2670
 #, c-format
 msgid "Week %d"
-msgstr "%d° nedelja"
+msgstr "%d. nedelja"
 
 #. Translators: %02i is the number of minutes;
 #. * this is a context menu entry to change the
@@ -4367,12 +4293,12 @@ msgstr "%d° nedelja"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:791
+#: ../calendar/gui/e-day-view-time-item.c:790
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: ../calendar/gui/e-day-view-time-item.c:816
+#: ../calendar/gui/e-day-view-time-item.c:815
 msgid "Show the second time zone"
 msgstr "Prikaži drugu vremensku zonu"
 
@@ -4382,124 +4308,122 @@ msgstr "Prikaži drugu vremensku zonu"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:833
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
+#: ../calendar/gui/e-day-view-time-item.c:832
+#: ../modules/calendar/e-calendar-preferences.c:185
+#: ../modules/calendar/e-calendar-preferences.c:237
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ništa"
 
-#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-day-view-time-item.c:866
 #: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:268
 msgid "Select..."
 msgstr "Izaberi..."
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Chair Persons"
 msgstr "Predsedavajući"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Required Participants"
 msgstr "Obavezni učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Optional Participants"
 msgstr "Mogući učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Resources"
 msgstr "Izvori"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:1160
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1157
 msgid "Resource"
 msgstr "Izvor"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1158
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1172
 msgid "Chair"
 msgstr "Stolica"
 
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/print.c:1177
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1174
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/print.c:1178
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1175
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-store.c:1069
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1082
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:615
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
-msgstr "Učesnik"
+msgstr "Učesnik                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-list-view.c:671
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
-msgstr "RSVP"
+msgstr "MVOM"
 
-#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "U toku"
 
-#: ../calendar/gui/e-meeting-store.c:1887
+#: ../calendar/gui/e-meeting-store.c:1906
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Unesite lozinku da pristupite podacima „slobodan/zauzet“ na serveru „%s“ kao "
 "korisnik „%s“"
 
-#: ../calendar/gui/e-meeting-store.c:1897
+#: ../calendar/gui/e-meeting-store.c:1916
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razlog neuspeha: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1902
-#: ../plugins/caldav/caldav-browse-server.c:958
-#: ../plugins/google-account-setup/google-source.c:458
-#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../calendar/gui/e-meeting-store.c:1921
+#: ../plugins/publish-calendar/publish-calendar.c:335
 #: ../smime/gui/component.c:54
 msgid "Enter password"
-msgstr "Unesite lozinku"
+msgstr "Upišite lozinku"
 
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Out of Office"
@@ -4511,7 +4435,7 @@ msgstr "Nema podatka"
 
 #: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "O_ptions"
-msgstr "O_pcije"
+msgstr "_Mogućnosti"
 
 #: ../calendar/gui/e-meeting-time-sel.c:620
 msgid "Show _only working hours"
@@ -4585,47 +4509,46 @@ msgstr "Zajedničko ime"
 msgid "Language"
 msgstr "Jezik"
 
-#: ../calendar/gui/e-memo-table.c:436
-#: ../modules/calendar/e-cal-shell-content.c:474
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
-#: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:459
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:476
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-view.c:301
 msgid "Memos"
 msgstr "Beleške"
 
-#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
 msgid "* No Summary *"
 msgstr "* Bez sažetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
 msgid "Start: "
-msgstr "Početak:"
+msgstr "Početak: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
 msgid "Due: "
 msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Cut selected memos to the clipboard"
 msgstr "Seče izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:745
 msgid "Copy selected memos to the clipboard"
 msgstr "Umnožava izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleške iz spiska isečaka"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../calendar/gui/e-memo-table.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "Delete selected memos"
 msgstr "Briše izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:763
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleške"
 
@@ -4641,41 +4564,40 @@ msgstr "Kliknite da dodate belešku"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:611
+#: ../calendar/gui/e-task-table.c:608
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
-#: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1048
+#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
+#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:435
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
-#: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:457
+#: ../modules/calendar/e-cal-shell-content.c:437
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-view.c:456
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Cut selected tasks to the clipboard"
 msgstr "Seče izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1028
 msgid "Copy selected tasks to the clipboard"
 msgstr "Umnožava izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1034
 msgid "Paste tasks from the clipboard"
 msgstr "Ubacuje zadatke iz spiska isečaka"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1040
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "Delete selected tasks"
 msgstr "Briše izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
@@ -4688,40 +4610,40 @@ msgstr "Izaberi vremensku zonu"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1963
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2253
+#: ../calendar/gui/gnome-cal.c:2315
 msgid "Purging"
 msgstr "Brisanje"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:819
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:918
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -4729,7 +4651,7 @@ msgstr "Podaci o kalendaru"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:955
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -4738,7 +4660,7 @@ msgstr "Prihvaćeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:826
+#: ../calendar/gui/itip-utils.c:962
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
@@ -4750,7 +4672,7 @@ msgstr "Prihvaćeno s rezervom"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:833 ../calendar/gui/itip-utils.c:881
+#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -4759,7 +4681,7 @@ msgstr "Odbijeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:976
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -4767,7 +4689,7 @@ msgstr "Delegirano"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:853
+#: ../calendar/gui/itip-utils.c:989
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -4775,7 +4697,7 @@ msgstr "Osveženo"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:860
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -4783,7 +4705,7 @@ msgstr "Otkaži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:867
+#: ../calendar/gui/itip-utils.c:1003
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -4791,252 +4713,252 @@ msgstr "Osveži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:874
+#: ../calendar/gui/itip-utils.c:1010
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:1088
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:960
+#: ../calendar/gui/itip-utils.c:1096
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:1123
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ne mogu da sačuvam unos, novi događaj se sukobljava sa nekim drugim."
 
-#: ../calendar/gui/itip-utils.c:991
+#: ../calendar/gui/itip-utils.c:1127
 msgid "Unable to book a resource, error: "
-msgstr "Ne mogu da sačuvam unos, greška:"
+msgstr "Ne mogu da sačuvam unos, greška: "
 
-#: ../calendar/gui/itip-utils.c:1156
+#: ../calendar/gui/itip-utils.c:1306
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Th"
 msgstr "Če"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Sa"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3156
+#: ../calendar/gui/print.c:3153
 msgid " to "
 msgstr " do "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3166
+#: ../calendar/gui/print.c:3163
 msgid " (Completed "
 msgstr " (Završeno je "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3169
 msgid "Completed "
 msgstr "Završeno je "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3182
+#: ../calendar/gui/print.c:3179
 msgid " (Due "
 msgstr " (Rok "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3189
+#: ../calendar/gui/print.c:3186
 msgid "Due "
 msgstr "Rok "
 
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3351
 #, c-format
 msgid "Summary: %s"
 msgstr "Sažetak: %s"
 
-#: ../calendar/gui/print.c:3381
+#: ../calendar/gui/print.c:3378
 msgid "Attendees: "
-msgstr "Prisutni:"
+msgstr "Prisutni: "
 
-#: ../calendar/gui/print.c:3424
+#: ../calendar/gui/print.c:3421
 #, c-format
 msgid "Status: %s"
-msgstr "Status: %s"
+msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:3439
+#: ../calendar/gui/print.c:3436
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3454
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:3468
+#: ../calendar/gui/print.c:3465
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:3481
+#: ../calendar/gui/print.c:3478
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3492
+#: ../calendar/gui/print.c:3489
 msgid "Contacts: "
 msgstr "Kontakti: "
 
@@ -5061,189 +4983,189 @@ msgstr "je veće od"
 msgid "is less than"
 msgstr "je manje od"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:83
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:437
-#: ../calendar/importers/icalendar-importer.c:870
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../calendar/importers/icalendar-importer.c:468
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../modules/itip-formatter/itip-view.c:5571
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:585
+#: ../calendar/importers/icalendar-importer.c:616
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iKalendara (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:617
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:676
+#: ../calendar/importers/icalendar-importer.c:707
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:760
+#: ../calendar/importers/icalendar-importer.c:791
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vKalendara (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:761
+#: ../calendar/importers/icalendar-importer.c:792
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1041
+#: ../calendar/importers/icalendar-importer.c:1075
 msgid "Calendar Events"
 msgstr "Događaji kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:1085
+#: ../calendar/importers/icalendar-importer.c:1119
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik kalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Događaj"
 
-#: ../calendar/importers/icalendar-importer.c:1156
-#: ../calendar/importers/icalendar-importer.c:1472
+#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/importers/icalendar-importer.c:1159
-#: ../calendar/importers/icalendar-importer.c:1473
+#: ../calendar/importers/icalendar-importer.c:1193
+#: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/importers/icalendar-importer.c:1168
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1207
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerak"
 
-#: ../calendar/importers/icalendar-importer.c:1178
+#: ../calendar/importers/icalendar-importer.c:1212
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ima podsetnike"
 
-#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1217
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Lično"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1236
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1211
-#: ../calendar/importers/icalendar-importer.c:1512
+#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1546
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sažetak"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1251
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1508
+#: ../calendar/importers/icalendar-importer.c:1259
+#: ../calendar/importers/icalendar-importer.c:1542
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Početak"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1248
+#: ../calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1292
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorije"
 
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Završeno"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1290
+#: ../calendar/importers/icalendar-importer.c:1324
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1301
-#: ../calendar/importers/icalendar-importer.c:1304
+#: ../calendar/importers/icalendar-importer.c:1335
+#: ../calendar/importers/icalendar-importer.c:1338
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1324
-#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1504
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
 
 # * We only place them here so gettext picks them up for translation.
 # * Don't include in any C files.
@@ -5301,7 +5223,7 @@ msgstr "Afrika/Bangui"
 
 #: ../calendar/zones.h:33
 msgid "Africa/Banjul"
-msgstr "Afrika/Banjul"
+msgstr "Afrika/Banžul"
 
 #: ../calendar/zones.h:34
 msgid "Africa/Bissau"
@@ -5353,7 +5275,7 @@ msgstr "Afrika/Duala"
 
 #: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
-msgstr "Afrika/El_Aun"
+msgstr "Afrika/El_Ajun"
 
 #: ../calendar/zones.h:47
 msgid "Africa/Freetown"
@@ -5393,7 +5315,7 @@ msgstr "Afrika/Lagos"
 
 #: ../calendar/zones.h:56
 msgid "Africa/Libreville"
-msgstr "Afrika/Libervil"
+msgstr "Afrika/Librevil"
 
 #: ../calendar/zones.h:57
 msgid "Africa/Lome"
@@ -5497,7 +5419,7 @@ msgstr "Amerika/Antigva"
 
 #: ../calendar/zones.h:82
 msgid "America/Araguaina"
-msgstr "Amerika/Aragvajana"
+msgstr "Amerika/Aragvajna"
 
 #: ../calendar/zones.h:83
 msgid "America/Aruba"
@@ -5505,7 +5427,7 @@ msgstr "Amerika/Aruba"
 
 #: ../calendar/zones.h:84
 msgid "America/Asuncion"
-msgstr "Amerika/Asansjon"
+msgstr "Amerika/Asunsion"
 
 #: ../calendar/zones.h:85
 msgid "America/Barbados"
@@ -5517,7 +5439,7 @@ msgstr "Amerika/Belem"
 
 #: ../calendar/zones.h:87
 msgid "America/Belize"
-msgstr "Amerika/Belize"
+msgstr "Amerika/Beliz"
 
 #: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
@@ -5537,7 +5459,7 @@ msgstr "Amerika/Buenos_Aires"
 
 #: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
-msgstr "Amerika/Kembridž_Bej"
+msgstr "Amerika/Kejmbridž_zaliv"
 
 #: ../calendar/zones.h:93
 msgid "America/Cancun"
@@ -5613,7 +5535,7 @@ msgstr "Amerika/Edmonton"
 
 #: ../calendar/zones.h:111
 msgid "America/Eirunepe"
-msgstr "Amerika/Erunepe"
+msgstr "Amerika/Ejrunepe"
 
 #: ../calendar/zones.h:112
 msgid "America/El_Salvador"
@@ -5637,7 +5559,7 @@ msgstr "Amerika/Gus_Bej"
 
 #: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
-msgstr "Amerika/Grend_Turk"
+msgstr "Amerika/Veliki_Turk"
 
 #: ../calendar/zones.h:118
 msgid "America/Grenada"
@@ -5653,7 +5575,7 @@ msgstr "Amerika/Gvatemala"
 
 #: ../calendar/zones.h:121
 msgid "America/Guayaquil"
-msgstr "Amerika/Gvajakul"
+msgstr "Amerika/Gvajakil"
 
 #: ../calendar/zones.h:122
 msgid "America/Guyana"
@@ -5669,7 +5591,7 @@ msgstr "Amerika/Havana"
 
 #: ../calendar/zones.h:125
 msgid "America/Hermosillo"
-msgstr "Amerika/Hermosilo"
+msgstr "Amerika/Ermosiljo"
 
 #: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
@@ -5693,11 +5615,11 @@ msgstr "Amerika/Indijanapolis"
 
 #: ../calendar/zones.h:131
 msgid "America/Inuvik"
-msgstr "Amerika/Ajnuvik"
+msgstr "Amerika/Inuvik"
 
 #: ../calendar/zones.h:132
 msgid "America/Iqaluit"
-msgstr "Amerika/Ikvalit"
+msgstr "Amerika/Ikaluit"
 
 #: ../calendar/zones.h:133
 msgid "America/Jamaica"
@@ -5717,7 +5639,7 @@ msgstr "Amerika/Kentaki/Liusvil"
 
 #: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
-msgstr "Amerika/Kentaki/Montikelo"
+msgstr "Amerika/Kentaki/Montićelo"
 
 #: ../calendar/zones.h:138
 msgid "America/La_Paz"
@@ -5737,7 +5659,7 @@ msgstr "Amerika/Luisvil"
 
 #: ../calendar/zones.h:142
 msgid "America/Maceio"
-msgstr "Amerika/Makeo"
+msgstr "Amerika/Maćejo"
 
 #: ../calendar/zones.h:143
 msgid "America/Managua"
@@ -5753,7 +5675,7 @@ msgstr "Amerika/Martinik"
 
 #: ../calendar/zones.h:146
 msgid "America/Mazatlan"
-msgstr "Amerika/Macatian"
+msgstr "Amerika/Macatlan"
 
 #: ../calendar/zones.h:147
 msgid "America/Mendoza"
@@ -5805,11 +5727,11 @@ msgstr "Amerika/Nipigon"
 
 #: ../calendar/zones.h:159
 msgid "America/Nome"
-msgstr "Amerika/Nomi"
+msgstr "Amerika/Nom"
 
 #: ../calendar/zones.h:160
 msgid "America/Noronha"
-msgstr "Amerika/Noroha"
+msgstr "Amerina/Norona"
 
 #: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
@@ -5833,7 +5755,7 @@ msgstr "Amerika/Feniks"
 
 #: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
-msgstr "Amerika/Porto_Prins"
+msgstr "Amerika/Portoprens"
 
 #: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
@@ -5893,23 +5815,23 @@ msgstr "Amerika/Šiprok"
 
 #: ../calendar/zones.h:181
 msgid "America/St_Johns"
-msgstr "Amerika/Sent_Džon"
+msgstr "Amerika/Sv_Džons"
 
 #: ../calendar/zones.h:182
 msgid "America/St_Kitts"
-msgstr "Amerika/Sent_Kits"
+msgstr "Amerika/Sv_Kits"
 
 #: ../calendar/zones.h:183
 msgid "America/St_Lucia"
-msgstr "Amerika/Sent_Lusija"
+msgstr "Amerika/Sv_Lucija"
 
 #: ../calendar/zones.h:184
 msgid "America/St_Thomas"
-msgstr "Amerika/Sent_Tomas"
+msgstr "Amerika/Sv_Tomas"
 
 #: ../calendar/zones.h:185
 msgid "America/St_Vincent"
-msgstr "Amerika/Sent_Vinsent"
+msgstr "Amerika/Sv_Vinsent"
 
 #: ../calendar/zones.h:186
 msgid "America/Swift_Current"
@@ -5921,7 +5843,7 @@ msgstr "Amerika/Tegusigalpa"
 
 #: ../calendar/zones.h:188
 msgid "America/Thule"
-msgstr "Amerika/Tule"
+msgstr "Amerika/Tula"
 
 #: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
@@ -5965,7 +5887,7 @@ msgstr "Antarktik/Dejvis"
 
 #: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
-msgstr "Antarktik/Dumontdurvil"
+msgstr "Antarktik/Dimondirvij"
 
 #: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
@@ -5973,7 +5895,7 @@ msgstr "Antarktik/Moson"
 
 #: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
-msgstr "Antarktik/Mek_Mardo"
+msgstr "Antarktik/Mekmardo"
 
 #: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
@@ -5981,7 +5903,7 @@ msgstr "Antarktik/Palmer"
 
 #: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
-msgstr "Antarktik/Saut_Pol"
+msgstr "Antarktik/Južni_pol"
 
 #: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
@@ -5993,7 +5915,7 @@ msgstr "Antarktik/Vostok"
 
 #: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
-msgstr "Arktik/Longjerbijen"
+msgstr "Arktik/Longjerbjen"
 
 #: ../calendar/zones.h:207
 msgid "Asia/Aden"
@@ -6029,7 +5951,7 @@ msgstr "Azija/Bagdad"
 
 #: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
-msgstr "Azija/Bahrejn"
+msgstr "Azija/Bahrein"
 
 #: ../calendar/zones.h:216
 msgid "Asia/Baku"
@@ -6037,7 +5959,7 @@ msgstr "Azija/Baku"
 
 #: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
-msgstr "Azija/Bankok"
+msgstr "Azija/Bangkok"
 
 #: ../calendar/zones.h:218
 msgid "Asia/Beirut"
@@ -6097,7 +6019,7 @@ msgstr "Azija/Harbin"
 
 #: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
-msgstr "Azija/Hong_Kong"
+msgstr "Azija/Hongkong"
 
 #: ../calendar/zones.h:233
 msgid "Asia/Hovd"
@@ -6209,7 +6131,7 @@ msgstr "Azija/Pontianak"
 
 #: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
-msgstr "Azija/Peking"
+msgstr "Azija/Pjongjang"
 
 #: ../calendar/zones.h:261
 msgid "Asia/Qatar"
@@ -6277,7 +6199,7 @@ msgstr "Azija/Tokio"
 
 #: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
-msgstr "Azija/Udžung_Pandang"
+msgstr "Azija/Ujung_Pandang"
 
 #: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
@@ -6321,11 +6243,11 @@ msgstr "Atlantik/Kanari"
 
 #: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
-msgstr "Atlantik/Kejp_Verde"
+msgstr "Atlantik/Zelenortska_Ostrva"
 
 #: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
-msgstr "Atlantik/Faro"
+msgstr "Atlantik/Farska_ostrva"
 
 #: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
@@ -6333,7 +6255,7 @@ msgstr "Atlantik/Jan_Majen"
 
 #: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
-msgstr "Atlantik/Madera"
+msgstr "Atlantik/Madejra"
 
 #: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
@@ -6341,11 +6263,11 @@ msgstr "Atlantik/Rejkjavik"
 
 #: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
-msgstr "Atlantik/Saut_Džordžija"
+msgstr "Atlantik/Južna_Džordžija"
 
 #: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
-msgstr "Atlantik/Sent_Helena"
+msgstr "Atlantik/Sv_Jelena"
 
 #: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
@@ -6353,7 +6275,7 @@ msgstr "Atlantik/Stenli"
 
 #: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
-msgstr "Australija/Adelaida"
+msgstr "Australija/Adelejd"
 
 #: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
@@ -6361,7 +6283,7 @@ msgstr "Australija/Brizbejn"
 
 #: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
-msgstr "Australija/Broken_Hil"
+msgstr "Australija/Brouken_Hil"
 
 #: ../calendar/zones.h:299
 msgid "Australia/Darwin"
@@ -6373,7 +6295,7 @@ msgstr "Australija/Hobart"
 
 #: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
-msgstr "Australija/Lindeman"
+msgstr "Australija/Lindman"
 
 #: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
@@ -6453,11 +6375,11 @@ msgstr "Evropa/Helsinki"
 
 #: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
-msgstr "Evropa/Istanbul"
+msgstr "Evropa/Istambul"
 
 #: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
-msgstr "Evropa/Kaljingrad"
+msgstr "Evropa/Kalinjingrad"
 
 #: ../calendar/zones.h:323
 msgid "Europe/Kiev"
@@ -6537,7 +6459,7 @@ msgstr "Evropa/Sarajevo"
 
 #: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
-msgstr "Evropa/Simferopol"
+msgstr "Evropa/Sevastopolj"
 
 #: ../calendar/zones.h:343
 msgid "Europe/Skopje"
@@ -6561,7 +6483,7 @@ msgstr "Evropa/Tirana"
 
 #: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
-msgstr "Evropa/Uznogorod"
+msgstr "Evropa/Užgorod"
 
 #: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
@@ -6601,43 +6523,43 @@ msgstr "Indijski/Antananarivo"
 
 #: ../calendar/zones.h:358
 msgid "Indian/Chagos"
-msgstr "Indijski/Kagos"
+msgstr "Indijski_okean/Čagos"
 
 #: ../calendar/zones.h:359
 msgid "Indian/Christmas"
-msgstr "Indijski/Kristmas"
+msgstr "Indijski_okean/Božićna_ostrva"
 
 #: ../calendar/zones.h:360
 msgid "Indian/Cocos"
-msgstr "Indijski/Kokos"
+msgstr "Indijski_okean/Kokos"
 
 #: ../calendar/zones.h:361
 msgid "Indian/Comoro"
-msgstr "Indijski/Komoro"
+msgstr "Indijski_okean/Komoro"
 
 #: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
-msgstr "Indijski/Kergelen"
+msgstr "Indijski/Kerguelen"
 
 #: ../calendar/zones.h:363
 msgid "Indian/Mahe"
-msgstr "Indijski/Mahe"
+msgstr "Indijski_okean/Mahe"
 
 #: ../calendar/zones.h:364
 msgid "Indian/Maldives"
-msgstr "Indijski/Maldivi"
+msgstr "Indijski_okean/Maldivi"
 
 #: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
-msgstr "Indijski/Mauricijus"
+msgstr "Indijski_okean/Mauricijus"
 
 #: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
-msgstr "Indijski/Majot"
+msgstr "Indijski_okean/Majot"
 
 #: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "Indijski/Riunion"
+msgstr "Indijski_okean/Reunion"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Apia"
@@ -6653,15 +6575,15 @@ msgstr "Pacifik/Čatam"
 
 #: ../calendar/zones.h:371
 msgid "Pacific/Easter"
-msgstr "Pacifik/Ister"
+msgstr "Pacifik/Uskršnja_ostrva"
 
 #: ../calendar/zones.h:372
 msgid "Pacific/Efate"
-msgstr "Pacifik/Efate"
+msgstr "Pacifik/Efat"
 
 #: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
-msgstr "Pacifik/Endenburi"
+msgstr "Pacifik/Enderburi"
 
 #: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
@@ -6681,7 +6603,7 @@ msgstr "Pacifik/Galapagos"
 
 #: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
-msgstr "Pacifik/Gamber"
+msgstr "Pacifik/Gambjer"
 
 #: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
@@ -6697,7 +6619,7 @@ msgstr "Pacifik/Honolulu"
 
 #: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
-msgstr "Pacifik/Džonson"
+msgstr "Pacifik/Džonston"
 
 #: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
@@ -6705,11 +6627,11 @@ msgstr "Pacifik/Kiritimati"
 
 #: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
-msgstr "Pacifik/Kozre"
+msgstr "Pacifik/Kosre"
 
 #: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
-msgstr "Pacifik/Kvadžalin"
+msgstr "Pacifik/Kvajalajn"
 
 #: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
@@ -6729,7 +6651,7 @@ msgstr "Pacifik/Nauru"
 
 #: ../calendar/zones.h:390
 msgid "Pacific/Niue"
-msgstr "Pacifik/Niue"
+msgstr "Pacifik/Njue"
 
 #: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
@@ -6802,112 +6724,108 @@ msgstr "IB priključka za umetanje"
 
 #: ../capplet/anjal-settings-main.c:162
 msgid "socket"
-msgstr "priključak"
+msgstr "utičnica"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Unesite vaše puno ime."
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
-msgstr "Unesite adresu e-pošte."
+msgstr "Unesite adresu el. pošte."
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
-msgstr "Uneta adresa e-pošte nije ispravna."
+msgstr "Uneta adresa el. pošte nije ispravna."
 
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your password."
 msgstr "Unesite vašu lozinku."
 
-#: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5429 ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:245
 msgid "CalDAV"
 msgstr "KolDAV"
 
-#: ../capplet/settings/mail-account-view.c:376
-#: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5300 ../mail/em-account-editor.c:5357
-#: ../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
-#: ../plugins/google-account-setup/google-source.c:87
+#: ../capplet/settings/mail-account-view.c:335
+#: ../capplet/settings/mail-account-view.c:378
 msgid "Google"
 msgstr "Gugl"
 
-#: ../capplet/settings/mail-account-view.c:497
-#: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4833 ../mail/em-account-editor.c:4868
+#: ../capplet/settings/mail-account-view.c:454
+#: ../capplet/settings/mail-account-view.c:558
 msgid "Always (SSL)"
 msgstr "Uvek (SSL)"
 
-#: ../capplet/settings/mail-account-view.c:500
-#: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4836 ../mail/em-account-editor.c:4871
+#: ../capplet/settings/mail-account-view.c:457
+#: ../capplet/settings/mail-account-view.c:561
 msgid "When possible (TLS)"
 msgstr "Kada je moguće (TLS)"
 
-#: ../capplet/settings/mail-account-view.c:503
-#: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4839
-#: ../mail/em-account-editor.c:4874
+#: ../capplet/settings/mail-account-view.c:460
+#: ../capplet/settings/mail-account-view.c:564
+#: ../mail/e-mail-config-defaults-page.c:729
 msgid "Never"
 msgstr "Nikada"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../capplet/settings/mail-account-view.c:511
+#: ../capplet/settings/mail-account-view.c:468
 msgid "Personal details:"
 msgstr "Lični podaci:"
 
-#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
+#: ../capplet/settings/mail-account-view.c:475
+#: ../widgets/misc/e-source-config.c:681 ../widgets/misc/e-source-config.c:685
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
+#: ../capplet/settings/mail-account-view.c:484
 msgid "Email address:"
-msgstr "Adresa e-pošte:"
+msgstr "Adresa el. pošte:"
 
-#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
+#: ../capplet/settings/mail-account-view.c:494
 msgid "Details:"
 msgstr "Detalji:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
+#: ../capplet/settings/mail-account-view.c:502
+#: ../mail/e-mail-config-summary-page.c:409
 msgid "Receiving"
 msgstr "Primanje"
 
-#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
+#: ../capplet/settings/mail-account-view.c:509
 msgid "Server type:"
-msgstr "Tip servera: "
+msgstr "Vrsta servera:"
 
-#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
+#: ../capplet/settings/mail-account-view.c:518
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
+#: ../capplet/settings/mail-account-view.c:527
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
-msgstr "Korisničkoime:"
+msgstr "Korisničko ime:"
 
-#: ../capplet/settings/mail-account-view.c:579
+#: ../capplet/settings/mail-account-view.c:536
 msgid "Use encryption:"
 msgstr "Koristi šifrovanje:"
 
-#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
+#: ../capplet/settings/mail-account-view.c:569
+#: ../mail/e-mail-config-summary-page.c:421
 msgid "Sending"
 msgstr "Slanje"
 
-#: ../capplet/settings/mail-account-view.c:655
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr ""
 "Da koristite program za poštu potrebno je da podesite nalog. Unesite adresu "
-"e-pošte i lozinku da pokušamo da prepoznamo postavke. Ukoliko to nije moguće "
-"automatski, moraćete da dodate i podatke o serveru."
+"el. 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:657
+#: ../capplet/settings/mail-account-view.c:617
 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 "
@@ -6917,11 +6835,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:659
+#: ../capplet/settings/mail-account-view.c:619
 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:661
+#: ../capplet/settings/mail-account-view.c:621
 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."
@@ -6929,11 +6847,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:662
+#: ../capplet/settings/mail-account-view.c:622
 msgid "You can specify your default settings for your account."
 msgstr "Možete odrediti podrazumevane postavke naloga."
 
-#: ../capplet/settings/mail-account-view.c:663
+#: ../capplet/settings/mail-account-view.c:623
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -6941,103 +6859,100 @@ 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:678
-#: ../mail/em-account-editor.c:2948 ../mail/em-account-editor.c:3087
+#: ../capplet/settings/mail-account-view.c:638
+#: ../mail/e-mail-config-identity-page.c:640
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:678
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Next - Receiving mail"
 msgstr "Napred — Primanje pošte"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:639
 msgid "Receiving mail"
 msgstr "Primanje pošte"
 
-#: ../capplet/settings/mail-account-view.c:679
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:639
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Next - Sending mail"
 msgstr "Napred — Slanje pošte"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:639
 msgid "Back - Identity"
 msgstr "Nazad — Identitet"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:639
 msgid "Next - Receiving options"
 msgstr "Napred — Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Receiving options"
 msgstr "Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:680
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:642
 msgid "Back - Receiving mail"
 msgstr "Nazad — Primanje pošte"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:642
 msgid "Sending mail"
 msgstr "Slanje pošte"
 
-#: ../capplet/settings/mail-account-view.c:682
-#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:642
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Next - Review account"
 msgstr "Napred — Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:642
 msgid "Next - Defaults"
 msgstr "Napred — Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:642
 msgid "Back - Receiving options"
 msgstr "Nazad — Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4100
+#: ../capplet/settings/mail-account-view.c:643
+#: ../mail/e-mail-config-defaults-page.c:812
 msgid "Defaults"
-msgstr "Podrazumevano"
+msgstr "Osnovno"
 
-#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Back - Sending mail"
 msgstr "Nazad — Slanje pošte"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:645
 msgid "Review account"
 msgstr "Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:645
 msgid "Finish"
 msgstr "Završetak"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:645
 msgid "Back - Sending"
 msgstr "Nazad — Slanje"
 
-#: ../capplet/settings/mail-account-view.c:855
+#: ../capplet/settings/mail-account-view.c:822
 msgid "Setup Google contacts with Evolution"
 msgstr "Podesite Gugl kontakte sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:856
+#: ../capplet/settings/mail-account-view.c:823
 msgid "Setup Google calendar with Evolution"
 msgstr "Podesite Gugl kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4928
+#: ../capplet/settings/mail-account-view.c:828
 msgid "You may need to enable IMAP access."
 msgstr "Možda ćete morati da omogućite IMAP pristup."
 
-#: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4905
+#: ../capplet/settings/mail-account-view.c:836
 msgid "Google account settings:"
 msgstr "Podešavanja Gugl naloga:"
 
-#: ../capplet/settings/mail-account-view.c:895
+#: ../capplet/settings/mail-account-view.c:862
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Podesite Jahu kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:899
-#: ../mail/em-account-editor.c:4975
+#: ../capplet/settings/mail-account-view.c:866
 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 "
@@ -7047,70 +6962,54 @@ msgstr ""
 "formiramo ime kalendara. Potvrdite ili unesite drugo ukoliko predloženo nije "
 "ispravno."
 
-#: ../capplet/settings/mail-account-view.c:908
-#: ../mail/em-account-editor.c:4960
+#: ../capplet/settings/mail-account-view.c:875
 msgid "Yahoo account settings:"
 msgstr "Podešavanja Jahu naloga:"
 
-#: ../capplet/settings/mail-account-view.c:922
+#: ../capplet/settings/mail-account-view.c:889
 msgid "Yahoo Calendar name:"
-msgstr "Ime Jahu kalendara:"
+msgstr "Naziv Jahu kalendara:"
 
-#: ../capplet/settings/mail-account-view.c:1119
+#: ../capplet/settings/mail-account-view.c:1088
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../capplet/settings/mail-account-view.c:1173
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:1143
+#: ../capplet/settings/mail-settings-view.c:260
 msgid "Close Tab"
 msgstr "Zatvori jezičak"
 
-#: ../capplet/settings/mail-account-view.c:1185
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "Čarobnjak naloga"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:209
 msgid "Evolution account assistant"
 msgstr "Pomoćnik naloga Evolucije"
 
-# On This Computer is always first and VFolders is always last
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377
-#: ../libemail-engine/e-mail-session.c:534
-#: ../modules/addressbook/e-book-shell-backend.c:106
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:108
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "Na ovom računaru"
-
-#: ../capplet/settings/mail-settings-view.c:152
+#: ../capplet/settings/mail-settings-view.c:145
 #, c-format
 msgid "Modify %s..."
 msgstr "Izmeni %s..."
 
-#: ../capplet/settings/mail-settings-view.c:154
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "Dodajte novi nalog"
 
-#: ../capplet/settings/mail-settings-view.c:194
+#: ../capplet/settings/mail-settings-view.c:189
 msgid "Account management"
 msgstr "Upravljanje nalozima"
 
-#: ../capplet/settings/mail-settings-view.c:274
+#: ../capplet/settings/mail-settings-view.c:272
 msgid "Settings"
-msgstr "Postavke"
+msgstr "Podešavanja"
 
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-signature-editor.c:211
+#: ../widgets/misc/e-mail-signature-editor.c:285
 msgid "_Close"
 msgstr "_Zatvori"
 
@@ -7126,7 +7025,7 @@ msgstr "Nova _poruka"
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
@@ -7148,11 +7047,11 @@ msgstr "Ko_dna strana"
 
 #: ../composer/e-composer-actions.c:349
 msgid "_Print..."
-msgstr "Štam_paj..."
+msgstr "_Štampaj..."
 
 #: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
-msgstr "Pre_gled pred štampu"
+msgstr "Pregled pred _štampu"
 
 #: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
@@ -7162,7 +7061,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:317
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:342
 msgid "S_end"
 msgstr "Poš_alji"
 
@@ -7254,15 +7153,15 @@ msgstr "Bira da li je polje Odgovor-za prikazano"
 msgid "Save Draft"
 msgstr "Sačuvaj nacrt"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:45
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje će primiti grafitnu kopiju (cc) poruke"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:48
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7270,7 +7169,7 @@ msgstr ""
 "Unesite adrese koje će primiti grafitnu kopiju poruke bez pojavljivanja u "
 "listi primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:849
 msgid "Fr_om:"
 msgstr "Š_alje:"
 
@@ -7278,63 +7177,64 @@ msgstr "Š_alje:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:788
+#: ../composer/e-composer-header-table.c:856
 msgid "_Reply-To:"
 msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:792
+#: ../composer/e-composer-header-table.c:861
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:797
+#: ../composer/e-composer-header-table.c:867
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:802
+#: ../composer/e-composer-header-table.c:873
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:807
+#: ../composer/e-composer-header-table.c:878
 msgid "_Post To:"
 msgstr "Objavi _na:"
 
-#: ../composer/e-composer-header-table.c:811
+#: ../composer/e-composer-header-table.c:882
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:820
+#: ../composer/e-composer-header-table.c:890
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:215
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar."
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:230
 msgid "Undo the last action"
 msgstr "Opoziva poslednju radnju"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:234
 msgid "Redo the last undone action"
 msgstr "Ponovo vrši opozvanu radnju"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:238
 msgid "Search for text"
 msgstr "Pretražuje tekst"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:242
 msgid "Search for and replace text"
 msgstr "Pretražuje i zamenjuje tekst"
 
-#: ../composer/e-composer-private.c:337
+#: ../composer/e-composer-private.c:362
 msgid "Save draft"
 msgstr "Sačuvajte nacrt"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:856
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7342,7 +7242,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:865
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7351,15 +7251,15 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4198
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno."
 
-#: ../composer/e-msg-composer.c:4867
+#: ../composer/e-msg-composer.c:4875
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
@@ -7491,7 +7391,7 @@ msgstr "Prijavljena greška bejaše „{0}“. Poruka najverovatnije nije sačuv
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Došlo je do greške tokom slanja. Kako želite da nastavite?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:154
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Prijavljena greška bejaše „{0}“."
 
@@ -7519,7 +7419,7 @@ msgid ""
 msgstr ""
 "Zato što radite van mreže, poruka će biti sačuvana u vašoj lokalnoj fascikli "
 "Za slanje. Kada se vratite na mrežu možete poslati poruku klikom na dugme "
-"Pošalji/Primi na liniji alata Evolucije."
+"Pošalji/Primi na traci alata Evolucije."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7529,7 +7429,7 @@ msgstr "Obaveštenje alarma Evolucije"
 msgid "Calendar event notifications"
 msgstr "Obaveštenja o događajima kalendara"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:941
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:935
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -7538,7 +7438,7 @@ msgstr "Evolucija"
 # bug(slobo): tooltip bi mogao da bude i „Pošaljite e-poruku prijateljima i pored
 # ovako uštogljenih originala
 # msgstr "Paket poslovnih programa"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
 msgid "Groupware Suite"
 msgstr "Paket grupe"
 
@@ -7556,10 +7456,9 @@ msgstr "Postavke pošte"
 
 #: ../data/evolution-settings.desktop.in.in.h:2
 msgid "Configure email accounts"
-msgstr "Podesite naloge e-pošte"
+msgstr "Podesite naloge el. pošte"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Enable address formatting"
 msgstr "Ukljčivanje oblikovanja adrese"
 
@@ -7571,12 +7470,10 @@ msgstr ""
 "Da li će adrese biti oblikovane prema standardu u državama njihovog odredišta"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Autocomplete length"
 msgstr "Dužina samodopunjavanja"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -7585,36 +7482,30 @@ msgstr ""
 "samodopuni."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "Prikazuje samodopunjeno ime sa adresom"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
-"Da li će u unosu da prisili prikazivanje adrese e-pošte sa imenom "
+"Da li će u unosu da prisili prikazivanje adrese el. pošte sa imenom "
 "samodopunjenog kontakta."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresa poslednje korišćene fascikle u prozorčetu za izbor imena"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Adresa za poslednju korišćenu fasciklu u prozorčetu za izbor imena."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Contact layout style"
 msgstr "Stil razmeštaja kontakta"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -7626,27 +7517,22 @@ msgstr ""
 "pregled) postavlja pregled pored liste kontakta."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Contact preview pane position (horizontal)"
-msgstr "Pozicija površi za pregled kontakta (položeno)"
+msgstr "Položaj površi za pregled kontakta (položeno)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr "Položaj površi za pregled kontakta kada je okrenuta položeno."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "Contact preview pane position (vertical)"
-msgstr "Pozicija pregleda kontakta (uspravno)"
+msgstr "Položaj pregleda kontakta (uspravno)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Pozicija površi za pregled kontakata kada je okrenuta uspravno."
+msgstr "Položaj površi za pregled kontakata kada je okrenuta uspravno."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
 msgid "Show maps"
 msgstr "Prikaži mape"
 
@@ -7663,7 +7549,6 @@ msgstr "Da li da prikaže mape u površi za pregled"
 # note(slobo): address book, adresar --> imenik na par mesta proba
 # note(slobo): spam , Đubre --> Neželjena pošta
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Primary address book"
 msgstr "Primarni adresar"
 
@@ -7676,22 +7561,18 @@ msgstr ""
 "„Kontakti“"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "Show preview pane"
 msgstr "Prikaži površ za pregled"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Da li će biti prikazana površ za pregled."
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Prebacuje poruke pošte u Unikod"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
@@ -7700,17 +7581,14 @@ msgstr ""
 "čiji su uzrok različiti kodni rasporedi."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Save directory for reminder audio"
 msgstr "Direktorijum čuvanja za zvuk podsetnika"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Directory for saving reminder audio files"
 msgstr "Direktorijum za čuvanje zvučnih datoteka podsetnika"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Birthday and anniversary reminder value"
 msgstr "Vrednosti podsetnika na rođendane i godišnjice"
 
@@ -7719,7 +7597,6 @@ msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr "Broj jedinica za određivanje podsetnika na rođendane ili godišnjice"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "Jedinice podsetnika na rođendane i godišnjice"
 
@@ -7731,7 +7608,6 @@ msgstr ""
 "Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili „dani“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Compress weekends in month view"
 msgstr "Sažmi vikende u mesečni pregled"
 
@@ -7744,7 +7620,6 @@ msgstr ""
 "prostor radne nedelje"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "Ask for confirmation when deleting items"
 msgstr "Traži potvrdu za brisanje stavki"
 
@@ -7753,7 +7628,6 @@ msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "Da li da traži potvrdu za brisanje zakazivanja ili zadatka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Confirm expunge"
 msgstr "Potvrdi pražnjenje"
 
@@ -7762,7 +7636,6 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks"
 msgstr "Da li da traži potvrdu pri izbacivanjuzakazivanja ili zadatka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Month view vertical pane position"
 msgstr "Pozicija uspravne površi Mesečnog pregleda"
 
@@ -7775,7 +7648,6 @@ msgstr ""
 "datumu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Workday end hour"
 msgstr "Čas kojim se završava radni dan"
 
@@ -7786,38 +7658,31 @@ msgstr ""
 "do 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Workday end minute"
 msgstr "Minut kojim se završava radni dan"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut kojim se završava radni dan, od 0 do 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
 msgid "Workday start hour"
 msgstr "Čas kojim počinje radni dan"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Sat kojim počinje radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 do 23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Workday start minute"
 msgstr "Minut kojim počinje radni dan"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut kojim počinje radni dan, od 0 do 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "The second timezone for a Day View"
 msgstr "Druga vremenska zona u Dnevnom pregledu"
 
@@ -7830,7 +7695,6 @@ msgstr ""
 "Vrednost je slična onoj koja je korišćena u ključu „timezone“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Recently used second time zones in a Day View"
 msgstr "Nedavno korišćene druge vremenske zone u Dnevnom pregledu"
 
@@ -7851,7 +7715,6 @@ msgstr ""
 "„day_second_zones“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
@@ -7860,7 +7723,6 @@ msgid "Number of units for determining a default reminder"
 msgstr "Broj jedinica za određivanje podrazumevanog podsetnika"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
@@ -7869,70 +7731,57 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Prikaži polje kategorije u uređivaču događaja/sastanaka/zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Da li da prikaže polje kategorije u uređivaču događaja/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Prikaži polje uloge u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Da li da prikaže polje sa ulogom u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Prikaži polje Molim odgovorite u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Da li da prikaže polje Molim odgovorite u uređivaču događaja/zadataka/"
 "sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Prikaži polje stanja u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje statusa u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Prikaži polje vremenske zone u uređivaču događaja/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Da li da prikaže polje vremenske zone u uređivaču događaja/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Prikaži polje tipa u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje tipa u uređivaču događaja/zadataka/sastanaka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Hide completed tasks"
 msgstr "Sakrij završene zadatke"
 
@@ -7941,7 +7790,6 @@ msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Da li da sakrije završene zadatke u pregledu zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
 msgid "Hide task units"
 msgstr "Sakrij jedinice zadataka"
 
@@ -7952,7 +7800,6 @@ msgstr ""
 "Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“ ili „dani“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid "Hide task value"
 msgstr "Sakrij vrednost zadataka"
 
@@ -7961,7 +7808,6 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "Broj jedinica za određivanje kada sakriti zadatke"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Horizontal pane position"
 msgstr "Pozicija položene površi"
 
@@ -7974,7 +7820,6 @@ msgstr ""
 "kada nije postavljen mesečni pregled, u pikselima"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Last reminder time"
 msgstr "Poslednje vreme podsetnika"
 
@@ -7983,7 +7828,6 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "Vreme poslednjeg pokretanja podsetnika, u „time_t“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Boja Markus Bejns linije - Dnevni pregled"
 
@@ -7992,7 +7836,6 @@ msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Boja Markus Bejns linije - traka vremena"
 
@@ -8003,7 +7846,6 @@ msgstr ""
 "prazno)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
@@ -8013,7 +7855,6 @@ msgid ""
 msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Memo preview pane position (horizontal)"
 msgstr "Pozicija pregleda beleški (vertikalno)"
 
@@ -8022,7 +7863,6 @@ msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Pozicija pregleda zadataka kada je postavljeno horizontalno"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Memo layout style"
 msgstr "Stil razmeštaja beleške"
 
@@ -8037,7 +7877,6 @@ msgstr ""
 "„1“ (vertikalan pregled) postavlja pregled pored spiska beleški"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Memo preview pane position (vertical)"
 msgstr "Pozicija pregleda beleške (vertikalno)"
 
@@ -8046,7 +7885,6 @@ msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Pozicija pregleda bečeški kada je postavljeno vertikalno"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Pozicija položene površi Mesečnog pregleda"
 
@@ -8067,7 +7905,6 @@ msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Da li da prikaže Mesečni pregled po nedeljama, umesto mesecima"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 msgid "Reminder programs"
 msgstr "Programi podsetnika"
 
@@ -8076,7 +7913,6 @@ msgid "Programs that are allowed to be run by reminders"
 msgstr "Programi koji mogu biti pokrenuti podsetnicima"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Show display reminders in notification tray"
 msgstr "Prikazuje podsetnike u obaveštajnoj zoni"
 
@@ -8090,10 +7926,9 @@ 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"
+msgstr "Naziv željene stavke novog dugmeta trake 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"
 
@@ -8106,7 +7941,6 @@ msgstr ""
 "„Kalendar“"
 
 #: ../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"
 
@@ -8118,7 +7952,6 @@ 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:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
@@ -8130,7 +7963,6 @@ msgstr ""
 "JIB izabranog (ili „primarnog“) zadatka u bočnoj površi u pregledu „Zadaci“"
 
 #: ../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"
 
@@ -8144,7 +7976,6 @@ msgstr ""
 "zamenjuje korisničkim delom elektronske adrese, a %d domenom"
 
 #: ../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"
 
@@ -8155,89 +7986,74 @@ msgstr ""
 "donjem levom kalendaru"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-msgid "List of selected calendars"
-msgstr "Obrišite izabrane kalendare"
+msgid "Search range for time-based searching in years"
+msgstr "Opseg pretrage za pretraživanje na osnovu vremena u godinama"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid "List of calendars to load"
-msgstr "Spisak dostupnih kalendara"
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+"Koliko godina pretraga na osnovu vremena može da ide unapred ili unazad od "
+"trenutno izabranog dana prilikom pretrage za još jednim dešavanjem; osnovno "
+"je deset godina"
 
 #: ../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: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:92
-msgid "List of selected task lists"
-msgstr "Spisak izabranih spiskova zadataka"
-
-#: ../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: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:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 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:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show the memo preview pane"
 msgstr "Prikazuje pregled beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "If \"true\", show the memo preview pane in the main window"
-msgstr "Ukoliko je „tačno“, u glavnom prozoru prikazuje pregled beleški"
+msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Show the task preview pane"
 msgstr "Prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "If \"true\", show the task preview pane in the main window"
-msgstr "Ukoliko je „tačno“, u glavnom prozoru prikazuje pregled zadataka"
+msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 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:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 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:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Vertical position for the tag pane"
 msgstr "Uspravan položaj za površ oznake"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "Highlight tasks due today"
 msgstr "Isticanje zadataka u toku dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 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:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Tasks due today color"
 msgstr "Boja zadatka za danas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8245,17 +8061,15 @@ 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:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
 msgstr "Pozicija pregleda zadataka (horizontalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Task layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 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 "
@@ -8265,32 +8079,30 @@ 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:110
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Task preview pane position (vertical)"
 msgstr "Pozicija pregleda zadataka (vertikalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 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:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
 msgstr "Isticanje neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 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:114
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Overdue tasks color"
 msgstr "Boja neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8298,21 +8110,19 @@ msgstr ""
 "Boja pozadine neispunjenih zadataka, u obliku „#rrggbb“. Koristi se zajedno "
 "sa isticanjem-neispunjenih-zadatka."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Time divisions"
 msgstr "Podela vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 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:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8320,113 +8130,93 @@ 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:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Twenty four hour time format"
 msgstr "24-časovni oblik vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Da li da prikaže vreme u dvadesetočasovnom formatu, umesto am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Birthday and anniversary reminder"
 msgstr "Podsetnik na rođendane i godišnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 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:124
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za zakazivanje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 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:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Use system timezone"
 msgstr "Koristi vremensku zonu sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 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:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Week start"
 msgstr "Početak nedelje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 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:130
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Work days"
 msgstr "Radni dani"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 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"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Configuration version"
-msgstr "Verzija podešavanja"
+msgid "Previous Evolution version"
+msgstr "Prethodno izdanje Evolucije"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+"The most recently used version of Evolution, expressed as \"major.minor.micro"
+"\". This is used for data and settings migration from older to newer "
+"versions."
 msgstr ""
-"Verzija podešavanja Evolucije, sa glavnim/sporednim/nivoom podešavanja (na "
-"primer „2.6.0“)."
+"Najnovije korišćeno izdanje Evolucije, izraženo u obliku „major.minor.micro“. "
+"Ovo se koristi prilikom preselenja podataka i podešavanja sa starijeg na "
+"novije izdanje."
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Last upgraded configuration version"
-msgstr "Poslednja nadograđena verzija podešavanja"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"Poslednja nadograđena verzija podešavanja Evolucije, sa glavnim/sporednim/"
-"nivoom podešavanja (na primer „2.6.0“)."
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "List of disabled plugins"
 msgstr "Spisak isključenih priključaka"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
 msgstr "Spisak isključenih priključaka u Evoluciji"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
 msgstr "Vodoravna koordinata prozora"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The window's Y coordinate"
 msgstr "Uspravna koordinata prozora"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
 msgid "The window's width in pixels"
 msgstr "Širina prozora u tačkama"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
 msgid "The window's height in pixels"
 msgstr "Visina prozora u tačkama"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
 msgstr "Da li će prozor biti uvećan"
 
@@ -8447,12 +8237,10 @@ msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "Da li su zaduženja iz Gnomovog kalendara uvežena ili nisu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Proverava da li je Evolucija podrazumevani program za poštu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -8460,17 +8248,14 @@ msgstr ""
 "program za poštu."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Default charset in which to compose messages"
 msgstr "Podrazumevani skup znakova za sastavljanje poruka"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Default charset in which to compose messages."
 msgstr "Podrazumevani skup znakova za sastavljanje poruka."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Path where picture gallery should search for its content"
 msgstr "Putanja u kojoj galerija slika treba da traži svoj sadržaj."
 
@@ -8485,32 +8270,26 @@ msgstr ""
 "koristi kada podešena putanja ne ukazuje na postojeću fasciklu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Spell check inline"
 msgstr "Unutrašnja provera pravopisa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtava oznake greški pri kucanju uz reči dok kucate."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatsko prepoznavanje smajlića"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Prepoznaje smajliće u tekstu i zamenjuje ih slikama."
 
@@ -8551,12 +8330,10 @@ msgstr ""
 "je rekao da prosleđena poruka sledi"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Group Reply replies to list"
 msgstr "Grupisanje odgovora Odgovori na spisku"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8564,16 +8341,14 @@ msgid ""
 "replying."
 msgstr ""
 "Umesto normalnog ponašanja odgovoranja svima, ova opcija će napraviti dugme "
-"„Odgovor grupi“ na liniji alata koje će pokušati da odgovori samo na dopisnu "
+"„Odgovor grupi“ na traci alata koje će pokušati da odgovori samo na dopisnu "
 "listi preko koje ste navikli da primate primerak poruke na koju odgovarate."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Put the cursor at the bottom of replies"
 msgstr "Postavlja kursor na dno odgovora"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:14
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8584,121 +8359,102 @@ msgstr ""
 "poruke."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Always request read receipt"
 msgstr "Uvek traži povratnicu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Da li se povratnica podrazumevano dodaje svakoj poruci."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano slanje HTML pošte"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Send HTML mail by default."
 msgstr "Šalje HTML poštu po podrazumevanoj vrednosti."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Spell checking color"
 msgstr "Boja za proveru pravopisa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Boja za podvlačenje pravopisnih greški prilikom provere pravopisa."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pravopisa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:22
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Spisak oznaka jezika rečnika koji se koriste za proveru pravopisa."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Prikazivanje polja „Bcc“ pri slanju poruke"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz menija „Pregled“ "
-"nakon izbora naloga pošte."
+"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika "
+"„Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Prikazivanje polja „Cc“ pri slanju poruke"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz menija „Pregled“ "
-"nakon izbora naloga pošte."
+"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika "
+"„Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Prikazivanje polja „Odgovor za“ kada šalje poruku"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"Prikazuje polje „Odgovor za“ pri slanju na poruke. Ovo se postavlja iz menija "
-"„Pregled“ nakon izbora naloga naloga pošte."
+"Prikazuje polje „Odgovor za“ pri slanju na poruke. Ovo se postavlja iz "
+"izbornika „Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Prikazivanje polja „Šalje“ pri slanju na dopisnu listu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
-"Prikazuje polje „Šalje“ pri slanju na dopisnu listu. Ovo se postavlja iz menija "
-"„Pregled“ nakon izbora naloga dopisne liste."
+"Prikazuje polje „Šalje“ pri slanju na dopisnu listu. Ovo se postavlja iz "
+"izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "Prikazivanje polja „Odgovor za“ pri slanju na dopisnu listu"
+msgstr "Prikazivanje polja „Odgovor za“ pri slanju na dopisnna spisku"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 "Prikazuje polje „Odgovor za“ pri slanju na dopisnu listu. Ovo se postavlja iz "
-"menija „Pregled“ nakon izbora naloga dopisne liste."
+"izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Digitalno potpisuje odgovore kada je potpisana originalna poruka"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:12
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8707,12 +8463,10 @@ msgstr ""
 "PGP ili S/MIME potpisane."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:33
 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 filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8724,12 +8478,10 @@ msgstr ""
 "pošto se ne pridržavaju RFC 2231, nego koriste neispravan standard RFC 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavlja personalizovane potpise iznad odgovora"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8740,26 +8492,22 @@ msgstr ""
 "dno poruke."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaje razdvojnik potpisa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 "Izaberite ovu opciju u slučaju da ne želite dodavanje razdvojnika ispred "
-"potpisa prilikom pisanja poruke. "
+"potpisa prilikom pisanja poruke."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Ignore list Reply-To:"
 msgstr "Zanemaruje listu „Odgovor-za:“"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8775,7 +8523,7 @@ msgstr ""
 "„Odgovor-za“, tako da će Evolucija da uradi onako kako ste vi zatražili. Ako "
 "koristite radnju privatnog odgovora, onda će odgovoriti privatno, a ako "
 "koristite radnju „Odgovori na listu“ onda će to da uradi. Vrši se upoređivanje "
-"zaglavlje „Odgovor-za“ sa zaglavljem „Lista objava“, ako postoji."
+"zaglavlje „Odgovor-za“ sa zaglavljem „Spisak objava“, ako postoji."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "List of localized 'Re'"
@@ -8788,16 +8536,35 @@ msgid ""
 "prefix. An example is 'SV,AV'."
 msgstr ""
 "Zarezom odvojeni spisak lokalizovanih skraćenica „Odg“ koje će biti "
-"preskočene u tekstu  prilikom odgovaranja na poruku, kao dodatak standardnom "
+"preskočene u tekstu prilikom odgovaranja na poruku, kao dodatak standardnom "
 "„Odg“ prefiksu. Jedan primer je „SV,AV“."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Save file format for drag-and-drop operation"
+msgstr "Format datoteke čuvanja za radnju prevlačenja i ubacivanja"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr "Može biti „mbox“ ili „pdf“."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Save name format for drag-and-drop operation"
+msgstr "Format naziva čuvanja za radnju prevlačenja i ubacivanja"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Can be either 2 to use current date and time or any other value for sent "
+"date of the message. This has a meaning only when dropping just one message."
+msgstr ""
+"Može biti 2 za korišćenje trentnog datuma i vremena ili neka druga vrednost "
+"za datum slanja poruke. Ovo ima smisla samo prilikom ubacivanja samo jedne "
+"poruke."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "Prikazivanje animiranih slika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8805,13 +8572,11 @@ msgstr ""
 "Omogućava animirane slike u HTML pošti. Mnogim korisnicima smetaju animirane "
 "slike i umesto njih žele nepokretne slike."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "Uključuje ili isključuje mogućnost traženja kucanja unapred"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8819,23 +8584,19 @@ msgstr ""
 "Omogućava pretraživanje iz bočne površi, što donosi interaktivnost u pretrazi "
 "naziva fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Isključuje ili omogućava skraćivanje naziva fascikli u bočnoj površi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Da li da onemogući opciju skraćivanja naziva fascikli u bočnoj traci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Uključuje ili isključuje magičnu razmaknicu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8843,65 +8604,53 @@ msgstr ""
 "Uključite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
 "spisak poruka i fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "Boja za isticanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kursora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogućava prikaz kursora, tako da vidite kursor dok čitate poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Load images for HTML messages over HTTP"
 msgstr "Učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -8911,33 +8660,27 @@ msgstr ""
 "ne učitava slike sa mreže. 1 — Učitava slike iz poruka ukoliko je pošiljalac "
 "u kontaktima. 2 — Uvek učitava slike sa mreže."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show Animations"
 msgstr "Prikazivanje animacija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all message headers"
 msgstr "Prikazivanje svih zaglavlja poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show all the headers when viewing a messages."
 msgstr "Prikazuje sva zaglavlja pri pregledu poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "List of custom headers and whether they are enabled."
 msgstr "Spisak proizvoljnih zaglavlja i da li su uključena."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -8949,33 +8692,27 @@ msgstr ""
 "enabled&gt; — izaberite ovu opciju ako će zaglavlje biti prikazivano u "
 "pregledu pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show photo of the sender"
 msgstr "Prikazivanje slike pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikazuje sliku pošiljaoca u oknu za čitanje poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Search for the sender photo in local address books"
 msgstr "Traži sliku pošiljaoca u lokalnim adresarima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ova će opcija pripomoći brzini pribavljanja pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Lista MIME tipova za proveru u pregledačima Bonobo delova"
+msgstr "Spisak MIME vrsta za proveru u pregledačima Bonobo delova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -8985,39 +8722,33 @@ msgstr ""
 "MIME tipovi sa ovog spiska koji su vezani za pregledač Bonobo delova u "
 "Gnomovoj bazi MIME tipova mogu biti korišćeni za prikaz sadržaja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava poruku viđenom posle navedenog roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava poruku viđenom posle navedenog roka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Timeout for marking messages as seen"
 msgstr "Vreme za označavanje poruka kao viđenim"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Vreme u milisekundama za koje će poruke biti označene kao viđenim."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Sender email-address column in the message list"
 msgstr "Prikaz kolone e-adresa pošiljaoca u spisku poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Prikazuje e-adresu pošiljaoca u posebnoj koloni u spisku poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -9025,8 +8756,7 @@ msgstr ""
 "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u uspravnom "
 "pregledu kolone „Poruke“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -9034,42 +8764,31 @@ msgstr ""
 "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u uspravnom "
 "pregledu kolone „Poruke“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show deleted messages in the message-list"
 msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid "Enable local folders"
-msgstr "Uključuje lokalne fascikle"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-msgid "Whether to show local folders (On This Computer) in a folder tree"
-msgstr "Da li da prikaže lokalne fascikle (Na ovom računaru) u stablu fascikle"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Enable search folders"
-msgstr "Uključuje fascikle pretrage"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid "Enable Unmatched search folder"
+msgstr "Uključi nepoklopljene fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Enable search folders on startup."
-msgstr "Omogućava fascikle pretrage pri pokretanju."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+"Uključuje nepoklopljene fascikle pretrage unutar fascikli pretrage. Ne radi "
+"ništa ako je su isključene fascikle pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -9077,22 +8796,19 @@ msgstr ""
 "Ovak ključ je pročitan jednom i potom vraćen na „false“ (netačno). Ovo uklanja "
 "poštu sa spiska i pregled za tu fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane."
 msgstr "Visina površi za liste poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "State of message headers in paned view"
 msgstr "Stanje zaglavlja poruke u pregledu površi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded and \"1\" = collapsed"
@@ -9100,23 +8816,19 @@ msgstr ""
 "Opisuje da li zaglavlja poruke u pregledu površi treba da budu skupljena ili "
 "raširena po osnovnoj vrednosti. 0 = raširena i 1 = skupljena"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "Širina površi spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "Širina površi spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9127,43 +8839,35 @@ msgstr ""
 "poruka. 0 — (klasičan pregled) smešta ovu površ ispoda spiska poruka. 1 — "
 "(vertikalan pregled) smešta površ pored spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "Font promenljive veličine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veličine za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "Korišćenje sopstvenih fontova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagođene fontove za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Sažima prikaz adresa u TO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9171,45 +8875,11 @@ msgstr ""
 "Vrši sažimanje prikaza adresa u TO/CC/BCC na broj određen u address_count "
 "(broj adresa)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Display only message texts not exceeding certain size"
-msgstr "Prikazuje samo tekst poruka koje ne prelaze određenu veličinu"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"Omogućava samo prikaz teksta poruka koje ne prelaze veličinu određenu ključem "
-"„message_text_part_limit“ (veličina dela teksta poruke)."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Message text limit for display"
-msgstr "Ograničenje teksta poruke za prikazivanje"
-
-# bug: s/interms/in terms/ (space)
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"Ovo određuje najveću veličinu teksta poruke koji može biti prikazan u "
-"Evoluciji, navedenu u kilobajtima (KB). Podrazumevano je 4096 (4MB). Ova "
-"vrednost se koristi samo kada je aktiviran ključ "
-"„force_message_limit“ (prisili ograničenje poruke)."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Broj adresa za prikaz u KO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9217,26 +8887,23 @@ msgstr ""
 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
 "posle čega je prikazano „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaz poruke prema naslovu rasprave"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja In-"
-"Reply-To ili References."
+"Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja "
+"„In-Reply-To“ ili „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raširenu raspravu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9244,13 +8911,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti podrazumevano biti raširene ili "
 "skupljene. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Da li se poruke nižu na osnovu poslednje poruke u raspravi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9259,12 +8924,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti biti razvrstani po poslednjoj poruci "
 "jedne niti, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ređa naloge azbučnim redom u stablu fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9276,33 +8940,27 @@ msgstr ""
 "izuzetkom fascikli „Na ovom računaru“ i „Potraži“, u suprotnom nalozi bivaju "
 "poređani na osnovu poretka koji je zadao korisnik"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "Dnevnik radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "Prazni slanje nakon filtriranja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9312,54 +8970,40 @@ msgstr ""
 "ove fascikle će se dogoditi samo ako se koristi neka radnja filtera "
 "„Prosledi“ i otprilike jedan minut posle prizivanja poslednje radnje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Stil prikaza poruke (normal — za normalan prikaz; full headers — za prikaz "
-"svih zaglavlja; source — za izvorni prikaz)"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt on empty subject"
 msgstr "Postavlja upit kada je naslov prazan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez naslova."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when emptying the trash"
 msgstr "Postavlja upit prilikom pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni smeće."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user expunges"
 msgstr "Postavlja upit pri pražnjenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Upitaće pre slanja primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9367,23 +9011,19 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja kada pokušavate da pošaljete poruku "
 "primaocima koji nisu unešeni kao adrese pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "Postavlja upit kada korisnik unese samo nevidljivu grafitnu kopiju (Bcc)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez primalaca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Postavlja upit kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9391,14 +9031,12 @@ msgstr ""
 "Postavlja upit kada korisnik pokuša da pošalje HTML poruku primaocima koji "
 "možda ne žele da primaju HTML poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Postavlja upit korisniku kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9406,23 +9044,19 @@ msgstr ""
 "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pitaće ga da "
 "li zaista želi to da uradi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt while marking multiple messages"
 msgstr "Postavlja upit pri označavanju više poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Uključuje ili isključuje upozorenje pri označavanju više poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when deleting messages in search folder"
 msgstr "Postavlja upit kod brisanja poruka iz fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -9431,13 +9065,45 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da je brisanje poruke iz fascikle "
 "pretrage trajno, a ne samo uklanjanje iz rezultata pretrage."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"Pitaće da li da umnoži fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"Moguće vrednosti su: „never“ — neće dopustiti umnožavanje fascikli "
+"prevlačenjem i ubacivanjem u stablo fascikli; „always“ — dopustiće umnožavanje "
+"fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
+"(ili svaka druga vrednost) pitaće korisnika."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"Pitaće da li da premesti fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"Moguće vrednosti su: „never“ — neće dopustiti premeštanje fascikli "
+"prevlačenjem i ubacivanjem u stablo fascikli; „always“ — dopustiće premeštanje "
+"fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
+"(ili svaka druga vrednost) pitaće korisnika."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt when replying privately to list messages"
 msgstr "Postavlja upit kada odgovarate privatno na listu poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9445,13 +9111,11 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete privatan odgovor na "
 "poruku koja je stigla sa dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Postavlja upit kada dopisna lista oduzme privatne odgovore"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -9461,21 +9125,18 @@ msgstr ""
 "odgovor na poruku koja je stigla sa dopisne liste, ali u listi zaglavlje "
 "„Odgovor-za“ je podešeno da vas preusmeri da odgovorite na listu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt when replying to many recipients"
 msgstr "Postavlja upit kada odgovarate većem broju primalaca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete odgovor mnogim ljudima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -9483,7 +9144,7 @@ msgstr ""
 "Pita da li da zatvori prozor sa porukom kada korisnik prosleđuje ili "
 "odgovara na poruku prikazanu u prozoru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "Possible values are: 'never' - to never close browser window, 'always' - to "
 "always close browser window or 'ask' - (or any other value) will ask user."
@@ -9492,53 +9153,42 @@ msgstr ""
 "„always“ — da uvek zatvori prozor pretraživača ili „ask“ — (ili bilo koja "
 "druga vrednost) pitaće korisnika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smećem pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje smeća, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-#: ../mail/evolution-mail.schemas.in.h:181
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj traci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-#: ../mail/evolution-mail.schemas.in.h:182
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9546,13 +9196,11 @@ msgstr ""
 "Može imati tri moguće vrednosti: 0 — za greške, 1 — za upozorenja i 2 — za "
 "poruke o dijagnozi kvara."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Show original \"Date\" header value."
 msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9562,13 +9210,11 @@ msgstr ""
 "se vremenske zone razlikuju). Inače uvek prikazuje vrednost zaglavlja „Datum“ "
 "prema postavkama i vremenskoj zoni korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -9576,56 +9222,46 @@ msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
 "oblika ime:boja gde boja koristi HTML heksa kodiranje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Check incoming mail being junk"
 msgstr "Vrši proveru da li je pristigla pošta đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima đubreta u dolaznoj pošti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Empty Junk folders on exit"
 msgstr "Prazni fascikle sa đubretom pri izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa đubretom pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana između pražnjenja đubreta na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanje vreme između pražnjenja đubreta na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Last time Empty Junk was run"
 msgstr "Vreme poslednjeg pražnjenja đubreta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje đubreta, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9635,13 +9271,11 @@ msgstr ""
 "priključci. Ukoliko je pomenuti podrazumevani priključak isključen, preostali "
 "dostupni priključci neće biti aktivirani."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Utvrđuje da li u adresaru da pregleda adrese pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9653,8 +9287,7 @@ msgstr ""
 "samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) označeni za "
 "samodopunjavanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9662,8 +9295,7 @@ msgstr ""
 "Utvrđuje da li samo u adresaru da pregleda adrese u potrazi za neželjenom "
 "poštom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -9673,15 +9305,13 @@ msgstr ""
 "da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta "
 "primljena od poznatih pošiljalaca od one neželjene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -9690,13 +9320,11 @@ msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte. Ukoliko je opcija uključena a zaglavlja navedena, provera će biti brža."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Custom headers to use while checking for junk."
 msgstr "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9704,35 +9332,31 @@ msgstr ""
 "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte. Elementi "
 "spiska su niz formata „headername=value“ (ime zaglavlja=vrednost)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Save directory"
 msgstr "Direktorijum čuvanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for saving mail component files."
 msgstr "Direktorijum za čuvanje datoteka modula za poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljača za učitavanje/prilaganje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorijum za učitavanje/prilaganje datoteka u sastavljač."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages on start"
 msgstr "Vrši proveru za novim porukama prilikom pokretanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9740,12 +9364,11 @@ msgstr ""
 "Da li će vršiti proveru za novim porukama prilikom pokretanja Evolucije. Ovo "
 "uključuje i slanje poruka iz fascikle Poslato."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Check for new messages in all active accounts"
 msgstr "Vrši proveru za novim porukama u svim aktivnim nalozima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9756,13 +9379,11 @@ msgstr ""
 "pokretanja Evolucije. Ova opcija se koristi samo zajedno sa "
 "„send_recv_on_start“ (pošalji_primi_pri_pokretanju) opcijom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-#: ../mail/evolution-mail.schemas.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Server synchronization interval"
 msgstr "Interval usaglašavanja sa serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-#: ../mail/evolution-mail.schemas.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9771,7 +9392,6 @@ msgstr ""
 "Interval mora biti najmanje 30 sekundi."
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -9792,16 +9412,17 @@ msgid "Address book source"
 msgstr "Izvor adresara"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
-msgstr "Adresar koji će biti korišćen za samousaglašene kontakte"
+msgid "Address book to use for storing automatically synced contacts."
+msgstr ""
+"Adresar koji će biti korišćen za smeštaj samostalno usaglašenih kontakata."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync GAIM contacts"
-msgstr "Samousklađivanje GAIM kontakata"
+msgid "Auto sync Pidgin contacts"
+msgstr "Samostalno usklađivanje kontakata Golupka"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "Da li će GAIM kontakti biti samostalno usklađeni"
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "Da li će kontakti Golupka biti samostalno usklađeni."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
@@ -9809,40 +9430,49 @@ msgstr "Uključuje samokontakte"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
 msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
-msgstr "Da li će kontakti biti samostalno dodati u korisnički adresar"
+"Whether contacts should be automatically added to the user's address book."
+msgstr "Da li će kontakti biti samostalno dodati u korisnički adresar."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr "Izvor GAIM adresara"
+msgid "Pidgin address book source"
+msgstr "Izvor Golupkovih adresara"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr "Adresar koji će biti korišćen za samousaglašene kontakte sa GAIM-a"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr ""
+"Adresar koji će biti korišćen za smeštaj samostalno usaglašene kontakte sa "
+"Golupka"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "Period provere GAIM-a"
+msgid "Pidgin check interval"
+msgstr "Period provere Golupka"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "Period provere za GAIM-ovo usklađivanje kontakata"
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "Period provere za Golupkovo usklađivanje kontakata."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "MD5 poslednjeg usklađivanja GAIM-a"
+msgid "Pidgin last sync MD5"
+msgstr "MD5 poslednjeg usklađivanja Golupka"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "Vreme poslednjeg usklađivanja GAIM-a"
+msgid "Pidgin last sync MD5."
+msgstr "MD5 poslednjeg usklađivanja Golupka."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "Vreme poslednjeg usklađivanja Golupka"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "Vreme poslednjeg usklađivanja Golupka."
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "Spisak prilagođenih zaglavlja"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -9853,17 +9483,14 @@ msgstr ""
 "zaglavlja, zatim „=“ i vrednosti odvojene sa „;“"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "Podrazumevani drugi uređivač"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
 msgstr "Podrazumevana naredba koja se koristi kao uređivač."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 #: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatski pokreće pri uređivanju nove poruke"
@@ -9874,12 +9501,10 @@ msgstr ""
 "Automatski pokreće uređivač kada je pritisnut taster u sastavljaču poruke."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Podrazumevano umetanje slike kontakta"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
@@ -9896,30 +9521,26 @@ msgid "Whether to delete processed iTip objects"
 msgstr "Da li da obriše obrađene iTip objekte"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Obaveštava samo za nove poruke u Sandučetu."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Da li da obavesti o novoj poruci samo za Sanduče."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
 msgid "Enable D-Bus messages."
-msgstr "Uključuje poruke D-Bus."
+msgstr "Uključuje poruke D-sabirnice."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Stvara D-BUS poruku kada stigne nova pošta."
+msgstr "Stvara poruku D-sabirnice kada stigne nova pošta."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Uključuje ikonu u obaveštajnu zonu."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Prikazuje ikonu za novu poštu u obaveštajnoj zoni kada stigne nova poruka."
@@ -9933,52 +9554,56 @@ msgid "Whether show message over the icon when new messages arrive."
 msgstr "Da li da prikaže poruku preko ikone kada stigne nova poruka."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "Pušta zvuk kada stigne nova poruka."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "Uključuje zvučna obaveštenja kada stigne nova poruka."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "Da li da pusti zvuk ili svirne kada stigne nova poruka."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
+msgstr ""
+"Da li će da pusti bilo kakav zvuk kada pristignu nove poruke. Ako nije "
+"izabrano (false), onda se ključevi „notify-sound-beep“, „notify-sound-file“, "
+"„notify-sound-play-file“ i „notify-sound-use-theme“ ne uzimaju u obzir."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "Pišti ili pušta zvučnu datoteku."
+msgid "Whether to emit a beep."
+msgstr "Da li da zapišti."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"Ako je postavljeno, zapištaće a inače pušta zvučnu datoteku kada stigne nova "
-"poruka."
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "Da li da zapišti kada stigne nova poruka."
 
 #: ../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 filename to be played."
-msgstr "Naziv datoteke za puštanje."
+msgstr "Naziv zvučne 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
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
 msgstr ""
-"Zvučna datoteka za puštanje kada stigne nova poruka, ukoliko nije uključeno "
-"obaveštenje sirenom."
+"Zvučna datoteka koja će biti puštena kada stigne nova poruka, ako je izabran "
+"ključ „notify-sound-play-file“."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "FIXME"
-msgstr "POPRAVIME"
+msgid "Whether to play a sound file."
+msgstr "Da li da pusti zvučnu datoteku."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+msgstr ""
+"Da li će da pusti zvučnu datoteku kada stigne nova poruka. Naziv zvučne "
+"datoteke je dat ključem „notify-sound-file“."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
 msgstr "Koristi zvuk teme"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Pušta zvuk teme kada stigne nova poruka, ukoliko nije uključeno obaveštenje "
@@ -10003,8 +9628,19 @@ msgstr ""
 msgid "Whether to show suppressed HTML output"
 msgstr "Da li će biti prikazan potisnut HTML izlaz"
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr "Spisak odredišta za objavljivanje"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+"Ovaj ključ navodi spisak odredišta na kojima objaviti kalendare. Svaka "
+"vrednost navodi IksML sa podešavanjima za objavljivanje na jedno odredište."
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
@@ -10013,12 +9649,10 @@ msgstr ""
 "telu poruke."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Skip development warning dialog"
 msgstr "Preskakanje prozorčeta sa upozorenjem o razvoju"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
@@ -10026,12 +9660,10 @@ msgstr ""
 "Evolucije."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Initial attachment view"
 msgstr "Polazni pregled priloga"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -10047,13 +9679,11 @@ msgstr "Polazna fascikla izbirača datoteka"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Polazna fascikla za prozorčiće izbirača datoteka."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Započinje rad van mreže"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Da li će se Evolucija pokrenuti u režimu za rad van mreže."
 
@@ -10067,32 +9697,26 @@ msgid ""
 msgstr "Spisak putanja fascikli za usklađivanje na disku za rad van mreže."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Enable express mode"
 msgstr "Uključi ekspresni režim"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Flag that enables a much simplified user interface."
 msgstr "Oznaka koja omogućava jednostavnije okruženje."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the window buttons should be visible."
 msgstr "Da li će dugmad prozora biti vidljiva."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Window button style"
 msgstr "Stil dugmadi prozora"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10103,57 +9727,46 @@ msgstr ""
 "Gnomovo podešavanje trake alata utvrđuje stil."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "Traka alata je vidljiva"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the toolbar should be visible."
 msgstr "Da li će traka alata biti vidljiva."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Sidebar is visible"
 msgstr "Bočna površ je vidljiva"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the sidebar should be visible."
 msgstr "Da li će bočna površ biti vidljiva."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Traka statusa je vidljiva"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the status bar should be visible."
 msgstr "Da li će traka stanja biti vidljiva."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Default sidebar width"
 msgstr "Podrazumevana širina bočne površi"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Podrazumevana širina bočne trake, u tačkama."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
@@ -10162,12 +9775,10 @@ msgid "Socket path for SpamAssassin"
 msgstr "Putanja priključnice za Ubicu spama"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
 
@@ -10179,102 +9790,371 @@ msgstr "Izvršni klijenta Ubice spama"
 msgid "SpamAssassin daemon binary"
 msgstr "Izvršni demona Ubice spama"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-attachment.c:363
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
+#: ../widgets/misc/e-attachment-bar.c:106
+#: ../widgets/misc/e-attachment-paned.c:176
+#: ../widgets/misc/e-attachment-paned.c:181
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Prilog"
+msgstr[1] "Prilozi"
+msgstr[2] "Prilozi"
+msgstr[3] "Prilog"
+
+#: ../em-format/e-mail-formatter-attachment.c:369
+msgid "Display as attachment"
+msgstr "Prikaži kao prilog"
+
+#: ../em-format/e-mail-formatter.c:1362 ../mail/e-mail-tag-editor.c:327
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
 msgid "From"
 msgstr "Šalje"
 
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter.c:1363 ../modules/mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2736
-#: ../mail/em-format-html.c:2759 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/e-mail-formatter.c:1365
+#: ../em-format/e-mail-formatter-utils.c:182
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../modules/mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2669 ../mail/em-format-html.c:2740
-#: ../mail/em-format-html.c:2762 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1366
+#: ../em-format/e-mail-formatter-utils.c:184
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../em-format/e-mail-formatter.c:1367
+#: ../em-format/e-mail-formatter-quote-headers.c:166
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1126
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Naslov"
 
-#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../em-format/e-mail-formatter.c:1368 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
 #: ../widgets/misc/e-dateedit.c:548
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "Grupe vesti"
 
-#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/e-mail-formatter.c:1370 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Lice"
 
-#: ../em-format/em-format.c:1474
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user@example.com"
+#: ../em-format/e-mail-formatter-headers.c:114
+#: ../plugins/mail-notification/mail-notification.c:396
 #, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
+msgid "From: %s"
+msgstr "Šalje: %s"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
+#: ../em-format/e-mail-formatter-headers.c:134
+#: ../em-format/e-mail-formatter-headers.c:139
+msgid "(no subject)"
+msgstr "(bez naslova)"
 
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Ne mogu da obradim MIME poruku. Prikazivanje izvora."
+#: ../em-format/e-mail-formatter-headers.c:340
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Poruku šalje „%s“ na ime „%s“"
 
-#: ../em-format/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržani tip šifre za višedelni/šifrovan (multipart/encrypted)"
+#: ../em-format/e-mail-formatter-image.c:152
+msgid "Regular Image"
+msgstr "Obična slika"
 
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "Ne mogu da analiziram PGP/MIME poruku"
+#: ../em-format/e-mail-formatter-image.c:158
+msgid "Display part as an image"
+msgstr "Prikazuje delove kao sliku"
 
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Ne mogu da analiziram PGP/MIME poruku: nepoznata greška"
+#: ../em-format/e-mail-formatter-message-rfc822.c:237
+msgid "RFC822 message"
+msgstr "RFC822 poruka"
 
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "Nepodržan oblik potpisa"
+#: ../em-format/e-mail-formatter-message-rfc822.c:243
+msgid "Format part as an RFC822 message"
+msgstr "Oblikuje deo kao RFC822 poruku"
+
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
+#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../widgets/menus/gal-define-views-dialog.c:352
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+msgid "Name"
+msgstr "Naziv"
+
+#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "Veličina"
+
+#. Add encryption/signature header
+#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:130
+msgid "Security"
+msgstr "Bezbednost"
+
+#: ../em-format/e-mail-formatter-print-headers.c:147
+msgid "GPG signed"
+msgstr "GPG potpisano"
 
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "Greška pri proveri potpisa"
+#: ../em-format/e-mail-formatter-print-headers.c:152
+msgid "GPG encrpyted"
+msgstr "GPG šifrovano"
 
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri proveri potpisa"
+#: ../em-format/e-mail-formatter-print-headers.c:158
+msgid "S/MIME signed"
+msgstr "S/MIME potpisano"
 
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "Ne mogu da analiziram PGP poruku:"
+#: ../em-format/e-mail-formatter-print-headers.c:164
+msgid "S/MIME encrpyted"
+msgstr "S/MIME šifrovano"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2861
-#: ../modules/mail/em-mailer-prefs.c:1046
+#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1048
 msgid "Mailer"
 msgstr "Pošiljalac"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1221
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Prosleđena poruka --------"
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
+#: ../em-format/e-mail-formatter-text-enriched.c:115
+msgid "Richtext"
+msgstr "Bogati tekst"
+
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
+#: ../em-format/e-mail-formatter-text-enriched.c:121
+msgid "Display part as enriched text"
+msgstr "Prikazuje deo kao obogaćeni tekst"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:104
+#: ../em-format/e-mail-formatter-text-html.c:338
+msgid "HTML"
+msgstr "HTML"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:110
+#: ../em-format/e-mail-formatter-text-html.c:344
+msgid "Format part as HTML"
+msgstr "Oblikuje deo kao HTML"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:182
+msgid "Plain Text"
+msgstr "Običan tekst"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:129
+#: ../em-format/e-mail-formatter-text-plain.c:188
+msgid "Format part as plain text"
+msgstr "Oblikuje deo kao običan tekst"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "Unsigned"
+msgstr "Nepotpisano"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid "Valid signature"
+msgstr "Ispravan potpis"
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
+"verovatno verodostojan."
+
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid "Invalid signature"
+msgstr "Neispravan potpis"
+
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
+
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid "Valid signature, but cannot verify sender"
+msgstr "Ispravan potpis, ali ne mogu da proverim pošiljaoca"
+
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
+"biti proveren."
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid "Signature exists, but need public key"
+msgstr "Potpis postoji, ali traži javni ključ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "Ova poruka je potpisana, ali nema odgovarajućeg javnog ključa."
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid "Unencrypted"
+msgstr "Nešifrovano"
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Ova poruka nije šifrovana. Njen sadržaj je moguće videti u prenosu preko "
+"Interneta."
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid "Encrypted, weak"
+msgstr "Šifrovano, slabo"
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće "
+"da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid "Encrypted"
+msgstr "Šifrovano"
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid "Encrypted, strong"
+msgstr "Šifrovano, jako"
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"Ova poruka je šifrovana, jakim algoritmom. Veoma je teško da neko sa strane "
+"u dogledno vreme vidi sadržaj ove poruke."
+
+#: ../em-format/e-mail-formatter-secure-button.c:190
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_View Certificate"
+msgstr "Pregledaj _uverenje"
+
+#: ../em-format/e-mail-formatter-secure-button.c:205
+msgid "This certificate is not viewable"
+msgstr "Ovo uverenje nije čitljivo"
+
+#: ../em-format/e-mail-formatter-source.c:139
+msgid "Source"
+msgstr "Izvor"
+
+#: ../em-format/e-mail-formatter-source.c:145
+msgid "Display source of a MIME part"
+msgstr "Prikazuje izvoe kao MIME deo"
+
+#: ../em-format/e-mail-parser-application-mbox.c:108
+#, c-format
+msgid "Error parsing MBOX part: %s"
+msgstr "Greška obrade MBOKS dela: %s"
+
+#: ../em-format/e-mail-parser-application-smime.c:104
+#, c-format
+msgid "Could not parse S/MIME message: %s"
+msgstr "Ne mogu da obradim S/MIME poruku: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#, c-format
+msgid "Could not parse PGP message: %s"
+msgstr "Ne mogu da obradim PGP poruku: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
+#: ../em-format/e-mail-parser-multipart-signed.c:144
+#, c-format
+msgid "Error verifying signature: %s"
+msgstr "Greška provere potpisa: %s"
+
+#: ../em-format/e-mail-parser-message-external.c:86
+msgid "Malformed external-body part"
+msgstr "Loše složen spoljni deo poruke"
+
+#: ../em-format/e-mail-parser-message-external.c:118
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pokazivač na FTP stranicu (%s)"
+
+#: ../em-format/e-mail-parser-message-external.c:129
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara stranici „%s“"
+
+#: ../em-format/e-mail-parser-message-external.c:131
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pokazivač na lokalnu datoteku (%s)"
+
+#: ../em-format/e-mail-parser-message-external.c:150
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pokazivač na udaljeni podatak (%s)"
+
+#: ../em-format/e-mail-parser-message-external.c:167
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:81
+#: ../em-format/e-mail-parser-multipart-signed.c:95
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Ne mogu da obradim MIME poruku. Prikazivanje izvora."
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Nepodržani tip šifre za višedelni/šifrovan (multipart/encrypted)"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#, c-format
+msgid "Could not parse PGP/MIME message: %s"
+msgstr "Ne mogu da obradim PGP/MIME poruku: %s"
+
+#: ../em-format/e-mail-parser-multipart-signed.c:129
+msgid "Unsupported signature format"
+msgstr "Nepodržan oblik potpisa"
+
+#: ../em-format/e-mail-part-utils.c:493
+#, c-format
+msgid "%s attachment"
+msgstr "%s prilog"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:248
@@ -10349,7 +10229,7 @@ msgstr "Korejski"
 
 #: ../e-util/e-charset.c:62
 msgid "Thai"
-msgstr "Tajvanski"
+msgstr "Tajlandski"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
@@ -10390,14 +10270,14 @@ msgstr "Vizuelni"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../modules/calendar/e-cal-shell-view-actions.c:1926
+#: ../modules/itip-formatter/itip-view.c:235
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow"
 msgstr "Sutra"
 
@@ -10468,7 +10348,7 @@ msgstr "Koristi podrazumevani lokalitet"
 
 #: ../e-util/e-datetime-format.c:574
 msgid "Format:"
-msgstr "Format:"
+msgstr "Oblik:"
 
 #: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
@@ -10487,12 +10367,6 @@ msgstr "Upisujem „%s“"
 msgid "Writing \"%s\" to %s"
 msgstr "Upisujem „%s“ u %s"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
-#: ../plugins/google-account-setup/google-contacts-source.c:392
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "nedelje"
-
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Došlo je do greške za vreme štampanja"
@@ -10514,7 +10388,7 @@ msgstr "Datoteka pod nazivom „{0}“ već postoji. Da li želite da je zamenit
 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."
+"Već postoji datoteka u „{0}“. Ukoliko je zamenite prepisaćete njen sadržaj."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
@@ -10537,17 +10411,17 @@ msgstr "Zbog „{1}“."
 msgid "Cannot open file \"{0}\"."
 msgstr "Ne mogu da otvorim datoteku „{0}“."
 
-#: ../e-util/e-util.c:245
+#: ../e-util/e-util.c:243
 msgid "Could not open the link."
 msgstr "Ne mogu da otvorim vezu."
 
-#: ../e-util/e-util.c:292
+#: ../e-util/e-util.c:290
 msgid "Could not display help for Evolution."
 msgstr "Ne mogu da prikažem pomoć za Evoluciju."
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10556,7 +10430,7 @@ msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 msgstr[3] "pre %d sekunde"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10565,7 +10439,7 @@ msgstr[1] "%d sekunde u budućnosti"
 msgstr[2] "%d sekundi u budućnosti"
 msgstr[3] "%d sekunda u budućnosti"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10574,7 +10448,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10583,7 +10457,7 @@ msgstr[1] "%d minuta u budućnosti"
 msgstr[2] "%d minuta u budućnosti"
 msgstr[3] "%d minut u budućnosti"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10592,7 +10466,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10601,7 +10475,7 @@ msgstr[1] "%d sata u budućnosti"
 msgstr[2] "%d sati u budućnosti"
 msgstr[3] "%d sat u budućnosti"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10610,7 +10484,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10619,7 +10493,7 @@ msgstr[1] "%d dana u budućnosti"
 msgstr[2] "%d dana u budućnosti"
 msgstr[3] "%d dan u budućnosti"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10628,7 +10502,7 @@ msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 msgstr[3] "pre %d nedelju"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10637,7 +10511,7 @@ msgstr[1] "%d nedelje u budućnosti"
 msgstr[2] "%d nedelja u budućnosti"
 msgstr[3] "%d nedelja u budućnosti"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10646,7 +10520,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10655,7 +10529,7 @@ msgstr[1] "%d meseca u budućnosti"
 msgstr[2] "%d meseci u budućnost"
 msgstr[3] "%d mesec u budućnosti"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10664,7 +10538,7 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godinu"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -10673,21 +10547,21 @@ msgstr[1] "%d godine u budućnosti"
 msgstr[2] "%d godina u budućnosti"
 msgstr[3] "%d godina u budućnosti"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:132
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
+#: ../filter/e-filter-datespec.c:157
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:142
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:290
+#: ../filter/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poređenje"
 
@@ -10695,25 +10569,25 @@ msgstr "Izaberite vreme za poređenje"
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../filter/e-filter-rule.c:686
+#: ../filter/e-filter-rule.c:741
 msgid "R_ule name:"
-msgstr "Ime p_ravila:"
+msgstr "Naziv _pravila:"
 
-#: ../filter/e-filter-rule.c:718
-msgid "Find items that meet the following conditions"
-msgstr "Pronađi stavke koje zadovoljavaju sledeće uslove"
+#: ../filter/e-filter-rule.c:791
+msgid "all the following conditions"
+msgstr "svim sledećim uslovima"
 
-#: ../filter/e-filter-rule.c:743
-msgid "If all conditions are met"
-msgstr "Ako su svi uslovi zadovoljeni"
+#: ../filter/e-filter-rule.c:792
+msgid "any of the following conditions"
+msgstr "bilo kom od sledećih uslova"
 
-#: ../filter/e-filter-rule.c:744
-msgid "If any conditions are met"
-msgstr "Ako je bilo koji uslov zadovoljen"
+#: ../filter/e-filter-rule.c:798
+msgid "_Find items which match:"
+msgstr "_Pronađi stavke koje odgovaraju:"
 
-#: ../filter/e-filter-rule.c:747
-msgid "_Find items:"
-msgstr "_Pronađi stavke:"
+#: ../filter/e-filter-rule.c:820
+msgid "Find items that meet the following conditions"
+msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -10724,48 +10598,51 @@ msgstr "_Pronađi stavke:"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
+#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../widgets/misc/e-mail-signature-combo-box.c:318
 msgid "None"
 msgstr "Ništa"
 
-#: ../filter/e-filter-rule.c:777
+#: ../filter/e-filter-rule.c:836
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:838
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../filter/e-filter-rule.c:780
+#: ../filter/e-filter-rule.c:839
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../filter/e-filter-rule.c:783
+#: ../filter/e-filter-rule.c:842
 msgid "I_nclude threads:"
 msgstr "Uključi _niti:"
 
-#: ../filter/e-filter-rule.c:808
+#: ../filter/e-filter-rule.c:919
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:306
+#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "Odlazno"
 
-#: ../filter/e-rule-editor.c:274
+#: ../filter/e-rule-editor.c:273
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/e-rule-editor.c:367
+#: ../filter/e-rule-editor.c:366
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -10799,7 +10676,7 @@ msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Ne mogu da prevedem regularan izraz „{1}“."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -10809,7 +10686,7 @@ msgstr "Morate dati ime ovom filteru."
 
 #: ../filter/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
-msgstr "Ime „{0}“je već upotrebljeno."
+msgstr "Naziv „{0}“ je već upotrebljen."
 
 #: ../filter/filter.error.xml.h:11
 msgid "Please choose another name."
@@ -10832,6 +10709,10 @@ msgstr "vreme u odnosu na trenutno vreme"
 msgid "seconds"
 msgstr "sekunde"
 
+#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "nedelje"
+
 #: ../filter/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
@@ -10885,17 +10766,22 @@ msgstr ""
 "Datum poruke će biti upoređen sa\n"
 "vremenom kada se filtriranje desilo."
 
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, c-format
+msgid "Invalid authentication result code (%d)"
+msgstr "Neispravan kod rezultata potvrđivanja identiteta (%d)"
+
+#: ../libemail-engine/e-mail-folder-utils.c:112
 #, c-format
 msgid "Saving message to folder '%s'"
-msgstr "Čuvanje poruke u fasciklu „%s“"
+msgstr "Čuvam poruku u fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:270
+#: ../libemail-engine/e-mail-folder-utils.c:557
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: ../libemail-engine/e-mail-folder-utils.c:378
-#: ../libemail-engine/e-mail-folder-utils.c:627
+#: ../libemail-engine/e-mail-folder-utils.c:667
+#: ../libemail-engine/e-mail-folder-utils.c:918
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -10904,29 +10790,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:472
+#: ../libemail-engine/e-mail-folder-utils.c:761
 msgid "Scanning messages for duplicates"
 msgstr "Tražim duplikate u porukama"
 
-#: ../libemail-engine/e-mail-folder-utils.c:875
+#: ../libemail-engine/e-mail-folder-utils.c:1169
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjam fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1009
+#: ../libemail-engine/e-mail-folder-utils.c:1306
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka „%s“ je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1013
+#: ../libemail-engine/e-mail-folder-utils.c:1310
 msgid "File has been removed."
 msgstr "Datoteka je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1072
+#: ../libemail-engine/e-mail-folder-utils.c:1369
 msgid "Removing attachments"
 msgstr "Uklanjam priloge"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1234
+#: ../libemail-engine/e-mail-folder-utils.c:1533
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -10935,103 +10821,86 @@ msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 msgstr[3] "Čuvam jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1588 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
 #, c-format
 msgid "Invalid folder URI '%s'"
-msgstr "Neispravna adresa fascikle „%s“"
+msgstr "Neispravna putanja fascikle „%s“"
 
-#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:719
-#: ../modules/mail/e-mail-shell-view-private.c:1095
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:765
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 msgid "Inbox"
 msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:107 ../mail/em-folder-tree-model.c:712
-#: ../modules/mail/e-mail-shell-view-private.c:1093
+#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1031
 msgid "Drafts"
 msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-tree-model.c:723
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 msgid "Outbox"
 msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:727
-#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
+#: ../modules/mail/e-mail-shell-view-private.c:1037
 msgid "Sent"
 msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
-#: ../plugins/templates/templates.c:1351
+#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
+#: ../plugins/templates/templates.c:1359
 msgid "Templates"
 msgstr "Šabloni"
 
-#: ../libemail-engine/e-mail-session.c:929
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Unesite lozinku za %s"
-
-#: ../libemail-engine/e-mail-session.c:933
-msgid "Enter Passphrase"
-msgstr "Unesite lozinku"
-
-#: ../libemail-engine/e-mail-session.c:937
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Unesite lozinku za %s"
-
-#: ../libemail-engine/e-mail-session.c:941
-msgid "Enter Password"
-msgstr "Unesite lozinku"
-
-#: ../libemail-engine/e-mail-session.c:992
+#: ../libemail-engine/e-mail-session.c:1326
 #, c-format
-msgid "User canceled operation."
-msgstr "Korisnik je otkazao operaciju."
+msgid "User cancelled operation"
+msgstr "Korisnik je otkazao radnju"
 
-#: ../libemail-engine/e-mail-session.c:1111
+#: ../libemail-engine/e-mail-session.c:1451
 #, c-format
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 msgstr "Nije dostavljena odredišna adresa, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-session.c:1120
+#: ../libemail-engine/e-mail-session.c:1464
 #, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "Nije pronađen nalog za korišćenje, prosleđivanje poruke je otkazano."
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr "Nije pronađen identitet za korišćenje, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-session.c:1274
+#: ../libemail-engine/e-mail-session.c:1626
 #, c-format
 msgid "%s authentication failed"
 msgstr "Nije uspelo %s potvrđivanje identiteta"
 
-#: ../libemail-engine/e-mail-session.c:1348
+#: ../libemail-engine/e-mail-session.c:1671
 #, c-format
-msgid "No password was provided"
-msgstr "Nije obezebđena lozinka"
+msgid "No data source found for UID '%s'"
+msgstr "Nije pronađen izvor podataka za JIB „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:416
+#: ../libemail-engine/e-mail-session-utils.c:420
 #, c-format
 msgid "Cannot get transport for account '%s'"
 msgstr "Ne mogu da dobijem prenos za nalog „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/e-mail-session-utils.c:508
+#: ../libemail-engine/mail-ops.c:694
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlazećih filtera: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:531
-#: ../libemail-engine/e-mail-session-utils.c:565
-#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#: ../libemail-engine/e-mail-session-utils.c:537
+#: ../libemail-engine/e-mail-session-utils.c:571
+#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11040,51 +10909,46 @@ msgstr ""
 "Nisam uspeo da prikačim u %s: %s\n"
 "Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
 
-#: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:591
+#: ../libemail-engine/mail-ops.c:769
 #, c-format
 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:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/e-mail-session-utils.c:821
+#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../libemail-engine/e-mail-session-utils.c:869
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Odjavljujem se sa fascikle „%s“"
-
-#: ../libemail-engine/e-mail-store-utils.c:169
+#: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Prekidanje veze sa „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:260
+#: ../libemail-engine/e-mail-store-utils.c:263
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ponovno povezivanje na „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:335
+#: ../libemail-engine/e-mail-store-utils.c:340
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Pripremam nalog „%s“ za rad van mreže"
 
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:884
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
 
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "Uzimanje pošte"
 
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:908
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
@@ -11093,7 +10957,7 @@ msgstr "Šaljem poruku %d od %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../libemail-engine/mail-ops.c:883
+#: ../libemail-engine/mail-ops.c:959
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -11102,59 +10966,44 @@ 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:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:965
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+#: ../libemail-engine/mail-ops.c:967
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1079
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1080
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Umnožavam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1197
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1270
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1271
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1257
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Osvežavam fasciklu „%s“"
-
-#: ../libemail-engine/mail-ops.c:1475
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "Praznim fasciklu „%s“"
-
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1345
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacujem smeće u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1664
-#, c-format
-msgid "Disconnecting %s"
-msgstr "Prekidam vezu sa „%s“"
-
 #: ../libemail-engine/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -11174,102 +11023,484 @@ msgstr "Prosleđena poruka — %s"
 msgid "Forwarded message"
 msgstr "Prosleđena poruka"
 
-#: ../libemail-utils/e-signature.c:710
-msgid "Autogenerated"
-msgstr "Automatski sastavljeno"
+#: ../libemail-engine/mail-vfolder.c:129
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Podešavanje fascikle pretrage: %s"
+
+#: ../libemail-engine/mail-vfolder.c:282
+#, c-format
+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
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:647
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Fascikla pretrage „%s“ je izmenjena u nalogu za obrisanu fasciklu\n"
+"„%s“."
+msgstr[1] ""
+"Fascikle pretrage „%s“ su izmenjene u nalogu za obrisanu fasciklu\n"
+"„%s“."
+msgstr[2] ""
+"Fascikle pretrage „%s“ su izmenjene u nalogu za obrisanu fasciklu\n"
+"„%s“."
+msgstr[3] ""
+"Fascikla pretrage „%s“ je izmenjena u nalogu za obrisanu fasciklu\n"
+"„%s“."
 
-#: ../mail/e-mail-account-manager.c:405
+#: ../mail/e-mail-account-manager.c:446
 msgid "_Restore Default"
 msgstr "Povrati _podrazumevano"
 
-#: ../mail/e-mail-account-manager.c:418
+#: ../mail/e-mail-account-manager.c:459
 msgid "You can drag and drop account names to reorder them."
 msgstr "Možete da prevučete i ubacite nazive naloga da ih ponovo poređate."
 
-#: ../mail/e-mail-account-manager.c:463
+#: ../mail/e-mail-account-manager.c:504
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:505
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:855
+#: ../plugins/publish-calendar/publish-calendar.c:866
 msgid "Enabled"
-msgstr "Omogućeno"
+msgstr "Uključen"
 
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
 msgid "Account Name"
-msgstr "Ime naloga"
+msgstr "Naziv naloga"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
-#: ../mail/mail-config.ui.h:51
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:558
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:333
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3664
+#: ../mail/mail-config.ui.h:44
 msgid "Default"
-msgstr "Podrazumevano"
+msgstr "Osnovno"
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Prilog"
-msgstr[1] "Prilozi"
-msgstr[2] "Prilozi"
-msgstr[3] "Prilog"
+#: ../mail/e-mail-autoconfig.c:194
+#, c-format
+msgid "No mail exchanger record for '%s'"
+msgstr "Nema zapisa razmenjivača pošte za „%s“"
 
-#: ../mail/e-mail-attachment-bar.c:619
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Pregled ikonicama"
+#: ../mail/e-mail-autoconfig.c:201
+#, c-format
+msgid "Temporarily unable to resolve '%s'"
+msgstr "Privremeno ne mogu da razrešim „%s“"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "Pregled spiskom"
+#: ../mail/e-mail-autoconfig.c:208
+#, c-format
+msgid "Error resolving '%s'"
+msgstr "Greška razrešavanja „%s“"
 
-#: ../mail/e-mail-backend.c:661
+#: ../mail/e-mail-autoconfig.c:264
+#, c-format
+msgid "No authoritative name server for '%s'"
+msgstr "Nema merodavnog servera naziva za „%s“"
+
+#: ../mail/e-mail-autoconfig.c:661
+msgid "No email address provided"
+msgstr "Nije dostavljena adresa el. pošte"
+
+#: ../mail/e-mail-autoconfig.c:670
+msgid "Missing domain in email address"
+msgstr "Nedostaje domen u adresi el. pošte"
+
+#: ../mail/e-mail-backend.c:726
 msgid "Unknown background operation"
 msgstr "Nepoznata pozadinska radnja"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
+#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
 msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
+msgstr "Zatvorite ovaj prozor"
 
-#: ../mail/e-mail-browser.c:289
+#: ../mail/e-mail-browser.c:284
 msgid "(No Subject)"
 msgstr "(Bez subjekta)"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-config-assistant.c:501
+msgid "Evolution Account Assistant"
+msgstr "Pomoćnik naloga Evolucije"
+
+#: ../mail/e-mail-config-auth-check.c:347
+msgid "Check for Supported Types"
+msgstr "Proverite za podržanim vrstama"
+
+#: ../mail/e-mail-config-confirm-page.c:157
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Čestitamo, podešavanje pošte je završeno.\n"
+"\n"
+"Sada ste spremni koristite Evoluciju za slanje i primanje pošte.\n"
+"\n"
+"Kliknite „Primeni“ da sačuvate postavke."
+
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "Urađeno"
+
+#: ../mail/e-mail-config-defaults-page.c:527
+msgid "Special Folders"
+msgstr "Posebne fascikle"
+
+#: ../mail/e-mail-config-defaults-page.c:536
+msgid "Draft Messages _Folder:"
+msgstr "Fascikla poruka _nacrta:"
+
+#: ../mail/e-mail-config-defaults-page.c:546
+msgid "Choose a folder for saving draft messages."
+msgstr "Izaberite fasciklu za čuvanje poruka nacrta."
+
+#: ../mail/e-mail-config-defaults-page.c:560
+msgid "Sent _Messages Folder:"
+msgstr "Fascikla poslatih _poruka:"
+
+#: ../mail/e-mail-config-defaults-page.c:570
+msgid "Choose a folder for saving sent messages."
+msgstr "Izaberite fasciklu za čuvanje poslatih poruka."
+
+#: ../mail/e-mail-config-defaults-page.c:584
+msgid "_Restore Defaults"
+msgstr "_Povrati osnovno"
+
+#: ../mail/e-mail-config-defaults-page.c:598
+msgid "Use a Real Folder for _Trash:"
+msgstr "Koristi stvarnu fasciklu za _smeće:"
+
+#: ../mail/e-mail-config-defaults-page.c:599
+msgid "Choose a folder for deleted messages."
+msgstr "Izaberite fasciklu za obrisane poruke."
+
+#: ../mail/e-mail-config-defaults-page.c:608
+msgid "Use a Real Folder for _Junk:"
+msgstr "Koristi stvarnu fasciklu za _đubre:"
+
+#: ../mail/e-mail-config-defaults-page.c:609
+msgid "Choose a folder for junk messages."
+msgstr "Izaberite fasciklu za nepoželjne poruke."
+
+#: ../mail/e-mail-config-defaults-page.c:626
+msgid "Composing Messages"
+msgstr "Sastavljanje poruka"
+
+#: ../mail/e-mail-config-defaults-page.c:635
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Uvek pošalji _grafitnu kopiju (cc):"
+
+#: ../mail/e-mail-config-defaults-page.c:660
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
+
+#: ../mail/e-mail-config-defaults-page.c:695
+msgid "Message Receipts"
+msgstr "Priznanice poruke"
+
+#: ../mail/e-mail-config-defaults-page.c:704
+msgid "S_end message receipts:"
+msgstr "_Pošalji povratnice:"
+
+#: ../mail/e-mail-config-defaults-page.c:735
+msgid "Always"
+msgstr "Uvek"
+
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Ask for each message"
+msgstr "Pitaj za svaku poruku"
+
+#: ../mail/e-mail-config-identity-page.c:254
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Unesite ime i elektronsku adresu. „Neobavezna“ polja ne moraju biti popunjena, "
+"osim ako ne želite da ove podatke uključite u poruke koje šaljete."
+
+#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-summary-page.c:324
+msgid "Account Information"
+msgstr "Podaci o nalogu"
+
+#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-summary-page.c:333
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+"Upišite ime po kome želite da nazovete ovaj nalog.\n"
+"Na primer, „Poslovni“ ili „Lični“."
+
+#: ../mail/e-mail-config-identity-page.c:299
+#: ../mail/e-mail-config-summary-page.c:341
+#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-mail-signature-script-dialog.c:417
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../mail/e-mail-config-identity-page.c:336
+msgid "Required Information"
+msgstr "Obavezni podaci"
+
+#: ../mail/e-mail-config-identity-page.c:345
+msgid "Full Nam_e:"
+msgstr "_Ime i prezime:"
+
+#: ../mail/e-mail-config-identity-page.c:372
+msgid "Email _Address:"
+msgstr "Adresa _el. pošte:"
+
+#: ../mail/e-mail-config-identity-page.c:409
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "Dodatni podaci"
+
+#: ../mail/e-mail-config-identity-page.c:417
+msgid "Re_ply-To:"
+msgstr "Od_govor:"
+
+#: ../mail/e-mail-config-identity-page.c:444
+msgid "Or_ganization:"
+msgstr "Or_ganizacija:"
+
+#: ../mail/e-mail-config-identity-page.c:499
+msgid "Add Ne_w Signature..."
+msgstr "Dodaj no_vi potpis..."
+
+#: ../mail/e-mail-config-lookup-page.c:68
+msgid "Looking up account details..."
+msgstr "Tražim pojedinosti naloga..."
+
+#: ../mail/e-mail-config-provider-page.c:485
+msgid "Checking for New Mail"
+msgstr "Vršim proveru za novom poštom"
+
+#: ../mail/e-mail-config-provider-page.c:501
+msgid "Check for _new messages every"
+msgstr "Proveri za _novu poštu svakih"
+
+#: ../mail/e-mail-config-provider-page.c:700
+msgid "Receiving Options"
+msgstr "Opcije za primanje"
+
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "Primanje pošte"
+
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "Opšte"
+
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "Ne potpisuj zahteve za s_astanke (Autluk kompatibilnost)"
+
+#: ../mail/e-mail-config-security-page.c:290
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Prilično dobra privatnost (OpenPGP)"
+
+#: ../mail/e-mail-config-security-page.c:298
+msgid "OpenPGP _Key ID:"
+msgstr "IB OpenPGP _ključa:"
+
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "Algoritam _potpisivanja:"
+
+#: ../mail/e-mail-config-security-page.c:336
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/e-mail-config-security-page.c:339
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/e-mail-config-security-page.c:342
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/e-mail-config-security-page.c:345
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/e-mail-config-security-page.c:361
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "_Uvek potpiši odlazeće poruke sa ovog naloga"
+
+#: ../mail/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Uv_ek i meni šifruj pri slanju šifrovane pošte"
+
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Uvek _veruj ključevima mog priveska pri šifrovanju"
+
+#: ../mail/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr "Sigurni MIME (S/MIME)"
+
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "Uverenje _potpisivanja:"
+
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+msgid "Select"
+msgstr "Izaberi"
+
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "Algoritam p_otpisa:"
+
+#: ../mail/e-mail-config-security-page.c:500
+msgid "Always sign outgoing messages when using this account"
+msgstr "Uvek potpiši odlazeće poruke sa ovog naloga"
+
+#: ../mail/e-mail-config-security-page.c:523
+msgid "Encryption certificate:"
+msgstr "Uverenje za šifrovanje:"
+
+#: ../mail/e-mail-config-security-page.c:565
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "Uvek šifruj odlazeće poruke sa ovog naloga"
+
+#: ../mail/e-mail-config-security-page.c:585
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
+
+#: ../mail/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "Slanje pošte"
+
+#: ../mail/e-mail-config-service-page.c:640
+msgid "Server _Type:"
+msgstr "_Vrsta servera:"
+
+#: ../mail/e-mail-config-summary-page.c:142
+msgid "SSL"
+msgstr "SSL"
+
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "TLS"
+msgstr "TLS"
+
+#: ../mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr ""
+"Ovo je sažetak podešavanja koja će biti korišćena za pristup vašoj pošti."
+
+#: ../mail/e-mail-config-summary-page.c:372
+msgid "Personal Details"
+msgstr "Lični podaci"
+
+#: ../mail/e-mail-config-summary-page.c:381
+msgid "Full Name:"
+msgstr "Ime i prezime:"
+
+#: ../mail/e-mail-config-summary-page.c:395
+msgid "Email Address:"
+msgstr "Adresa el. pošte:"
+
+#: ../mail/e-mail-config-summary-page.c:433
+msgid "Server Type:"
+msgstr "Vrsta servera:"
+
+#: ../mail/e-mail-config-summary-page.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
+msgid "Server:"
+msgstr "Server:"
+
+#: ../mail/e-mail-config-summary-page.c:496
+msgid "Security:"
+msgstr "Bezbednost:"
+
+#: ../mail/e-mail-config-summary-page.c:787
+msgid "Account Summary"
+msgstr "Sažetak naloga"
+
+#: ../mail/e-mail-config-welcome-page.c:157
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Dobrodošli u Pomoćnika podešavanja pošte Evolucije.\n"
+"\n"
+"Kliknite „Nastavi“ da započnete."
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:150
+msgid "Welcome"
+msgstr "Dobrodošli"
+
+#: ../mail/e-mail-config-window.c:329
+msgid "Account Editor"
+msgstr "Uređivač naloga"
+
+#: ../mail/e-mail-display.c:121
 msgid "_Add to Address Book..."
 msgstr "_Dodaj u adresar..."
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:128
 msgid "_To This Address"
 msgstr "_Na ovu adresu"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:135
 msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:142
 msgid "Send _Reply To..."
 msgstr "_Pošalji odgovor..."
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:144
 msgid "Send a reply message to this address"
 msgstr "Pošaljite poruku odgovora na ovu adresu"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:151
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
+#: ../mail/e-mail-display.c:161
+msgid "Save _Image..."
+msgstr "Sačuvaj _sliku"
+
+#: ../mail/e-mail-display.c:163
+msgid "Save the image to a file"
+msgstr "Sačuvajte sliku u datoteku"
+
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -11282,7 +11513,7 @@ msgstr "Naziv _oznake:"
 
 #: ../mail/e-mail-label-list-store.c:49
 msgid "I_mportant"
-msgstr "Važ_no"
+msgstr "_Važno"
 
 #. red
 #: ../mail/e-mail-label-list-store.c:50
@@ -11308,13 +11539,13 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../modules/mail/e-mail-shell-view-actions.c:718
 msgid "Add Label"
-msgstr "Dodaj oznaku"
+msgstr "Dodajte natpis"
 
 #: ../mail/e-mail-label-manager.c:221
 msgid "Edit Label"
-msgstr "Uredi oznaku"
+msgstr "Uredite natpis"
 
 #: ../mail/e-mail-label-manager.c:353
 msgid ""
@@ -11328,15 +11559,7 @@ msgstr ""
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1359
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "Ime"
-
-#: ../mail/e-mail-migrate.c:1269
+#: ../mail/e-mail-migrate.c:646
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Ne mogu da napravim lokalne fascikle za poštu u „%s“: %s"
@@ -11345,624 +11568,661 @@ msgstr "Ne mogu da napravim lokalne fascikle za poštu u „%s“: %s"
 msgid "Please select a folder"
 msgstr "Izaberite fasciklu."
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-printer.c:124
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stranica %d od %d"
+
+#: ../mail/e-mail-printer.c:521
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Štampaj"
+
+#: ../mail/e-mail-printer.c:527
+msgid "Header Name"
+msgstr "Naziv zaglavlja"
+
+#: ../mail/e-mail-printer.c:533
+msgid "Header Value"
+msgstr "Vrednost zaglavlja"
+
+#: ../mail/e-mail-printer.c:581 ../mail/mail-config.ui.h:100
+msgid "Headers"
+msgstr "Zaglavlja"
+
+#: ../mail/e-mail-reader.c:357
+msgid "Save Image"
+msgstr "Sačuvaj sliku"
+
+#: ../mail/e-mail-reader.c:440 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Umnoži u fasciklu"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:440 ../mail/em-folder-utils.c:488
 msgid "C_opy"
 msgstr "_Umnoži"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:974 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:974 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1335 ../mail/e-mail-reader.c:1517
+#: ../mail/e-mail-reader.c:1557
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1563
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1747
+msgid "Failed to retrieve message:"
+msgstr "Nisam uspeo da dovučem poruku:"
+
+#: ../mail/e-mail-reader.c:1793 ../mail/e-mail-reader.c:2882
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Dovlačim poruku „%s“"
+
+#: ../mail/e-mail-reader.c:1969
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1971
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1976
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1978
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1983
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1985
 msgid "Copy selected messages to another folder"
 msgstr "Umnožava izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1990
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1992
 msgid "Mark the selected messages for deletion"
-msgstr "Označava izabranu(e) poruku(e) za brisanje"
+msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1823
-msgid "Filter on Mailing _List..."
-msgstr "Filter na dopisnu _listu..."
+#: ../mail/e-mail-reader.c:1997
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "Napravi pravilo propusnika za dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1999
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Pravi pravilo za filtriranje poruka na ovu dopisnu listu"
+msgstr "Naravite pravilo za propuštanje poruka na ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:1830
-msgid "Filter on _Recipients..."
-msgstr "Filter na _primaoce..."
+#: ../mail/e-mail-reader.c:2004
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "Napravi pravilo propusnika za _primaoce..."
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:2006
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Pravi pravilo za filtriranje poruka ovim primaocima"
+msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:1837
-msgid "Filter on Se_nder..."
-msgstr "Filter na poš_iljaoca..."
+#: ../mail/e-mail-reader.c:2011
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "Napravi pravilo propusnika za _pošiljaoca..."
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:2013
 msgid "Create a rule to filter messages from this sender"
-msgstr "Pravi pravilo za filtriranje poruka od ovog pošiljaoca"
+msgstr "Napravite pravilo za propuštanje poruka sa ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:1844
-msgid "Filter on _Subject..."
-msgstr "Filter na _naslov..."
+#: ../mail/e-mail-reader.c:2018
+msgid "Create a Filter Rule for _Subject..."
+msgstr "Napravi pravilo propusnika za _naslov..."
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:2020
 msgid "Create a rule to filter messages with this subject"
-msgstr "Pravi pravilo za filtriranje poruka sa ovim naslovom"
+msgstr "Napravite pravilo za prpuštanje poruka sa ovim naslovom"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2025
 msgid "A_pply Filters"
-msgstr "Pri_meni filtere"
+msgstr "Pri_meni propusnike"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:2027
 msgid "Apply filter rules to the selected messages"
-msgstr "Primenjuje pravila filtriranja na izabrane poruke"
+msgstr "Primenite pravila propuštanja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2032
 msgid "_Find in Message..."
 msgstr "P_ronađi u poruci..."
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:2034
 msgid "Search for text in the body of the displayed message"
-msgstr "Pretražuje tekst u telu prikazane poruke"
+msgstr "Potražite tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:2039
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:2041
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "Uklanja oznaku za praćenje sa izabranih poruka"
+msgstr "Uklonite oznaku za praćenje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2046
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:2048
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Postavlja oznaku za praćenje kao završenu na izabranim porukama"
+msgstr "Postavite oznaku za praćenje kao završenu na izabranim porukama"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2053
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:2055
 msgid "Flag the selected messages for follow-up"
-msgstr "Označava izabrane poruke za praćenje"
+msgstr "Označite izabrane poruke za praćenje"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2060
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Prosleđuje izabranu poruku nekome kao prilog"
+msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2067
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2074
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
 msgid "Forward the selected message in the body of a new message"
-msgstr "Prosleđuje izabranu poruku u telu nove poruke"
+msgstr "Prosledite izabranu poruku u telu nove poruke"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2081
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2088
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2097
 msgid "Forward the selected message quoted like a reply"
-msgstr "Prosleđuje izabranu poruku citiranu kao odgovor"
+msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2095
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2102
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2104
 msgid "Force images in HTML mail to be loaded"
-msgstr "Silom učitava slike u HTML porukama"
+msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2109
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2111
 msgid "Mark the selected messages as important"
-msgstr "Označava izabranu(e) poruku(e) kao važno"
+msgstr "Označite izabranu(e) poruku(e) kao važno"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2116
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2118
 msgid "Mark the selected messages as junk"
-msgstr "Označava izabranu(e) poruku(e) kao neželjenu poštu"
+msgstr "Označite izabranu(e) poruku(e) kao neželjenu poštu"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2123
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2125
 msgid "Mark the selected messages as not being junk"
-msgstr "Označava izabranu(e) poruku(e) da nije neželjena pošta"
+msgstr "Označite izabranu(e) poruku(e) da nije neželjena pošta"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2130
 msgid "_Read"
 msgstr "Pro_čitaj"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2132
 msgid "Mark the selected messages as having been read"
-msgstr "Označava izabranu(e) poruku(e) kao pročitano"
+msgstr "Označite izabranu(e) poruku(e) kao pročitano"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2137
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2139
 msgid "Mark the selected messages as unimportant"
-msgstr "Označava izabranu(e) poruku(e) kao nevažno"
+msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2144
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2146
 msgid "Mark the selected messages as not having been read"
-msgstr "Označava izabranu(e) poruku(e) kao nepročitano"
+msgstr "Označite izabranu(e) poruku(e) kao nepročitano"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2151
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2153
 msgid "Open the selected messages in the composer for editing"
-msgstr "Otvara izabranu poruku u sastavljaču radi uređivanja"
+msgstr "Otvorite izabranu poruku u sastavljaču radi uređivanja"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2158
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2160
 msgid "Open a window for composing a mail message"
-msgstr "Otvara prozor za sastavljanje poruke"
+msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2165
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2167
 msgid "Open the selected messages in a new window"
-msgstr "Otvara izabrane poruke u novom prozoru"
+msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2172
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2174
 msgid "Move selected messages to another folder"
-msgstr "Premešta izabranu(e) poruku(e) u drugu fasciklu"
+msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2179
 msgid "_Switch to Folder"
 msgstr "Pređi u _fasciklu"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2181
 msgid "Display the parent folder"
-msgstr "Prikazuje nadređenu fasciklu"
+msgstr "Prikažite nadređenu fasciklu"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2186
 msgid "Switch to _next tab"
 msgstr "Prebaci na _sledeći jezičak"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2188
 msgid "Switch to the next tab"
-msgstr "Prebacuje na sledeći jezičak"
+msgstr "Prebacite se na sledeći jezičak"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2193
 msgid "Switch to _previous tab"
 msgstr "Prebaci na _prethodni jezičak"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2195
 msgid "Switch to the previous tab"
-msgstr "Prebacuje na prethodni jezičak"
+msgstr "Prebacite se na prethodni jezičak"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2200
 msgid "Cl_ose current tab"
 msgstr "_Zatvori trenutni jezičak"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2202
 msgid "Close current tab"
-msgstr "Zatvara trenutni jezičak"
+msgstr "Zatvorite trenutni jezičak"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2207
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2209
 msgid "Display the next message"
-msgstr "Prikazuje sledeću poruku"
+msgstr "Prikažite sledeću poruku"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2214
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2216
 msgid "Display the next important message"
-msgstr "Prikazuje sledeću važnu poruku"
+msgstr "Prikažite sledeću važnu poruku"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2221
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2223
 msgid "Display the next thread"
-msgstr "Prikazuje sledeću raspravu"
+msgstr "Prikažite sledeću raspravu"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2228
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2230
 msgid "Display the next unread message"
-msgstr "Prikazuje sledeću nepročitanu poruku"
+msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2235
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2237
 msgid "Display the previous message"
-msgstr "Prikazuje prethodnu poruku"
+msgstr "Prikažite prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2242
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2244
 msgid "Display the previous important message"
-msgstr "Prikazuje prethodnu važnu poruku"
+msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2249
 msgid "Previous T_hread"
-msgstr "_Prethodna poruka"
+msgstr "_Prethodna tema"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2251
 msgid "Display the previous thread"
-msgstr "Prikažite prethodnu poruku"
+msgstr "Prikažite prethodnu temu"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2256
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2258
 msgid "Display the previous unread message"
-msgstr "Prikazuje prethodnu nepročitanu poruku"
+msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2265
 msgid "Print this message"
-msgstr "Štampaj ovu poruku"
+msgstr "Štampajte ovu poruku"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2272
 msgid "Preview the message to be printed"
-msgstr "Pregleda poruku pred štampu"
+msgstr "Pregledajte poruku pred štampu"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2277
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2279
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "Preusmerava (bez čitanja) izabranu poruku nekome"
+msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2284
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2286
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2291
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2293
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../mail/e-mail-reader.c:2298 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2300
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2131 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2305 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2307
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2138
-#: ../modules/mail/e-mail-attachment-handler.c:188
+#: ../mail/e-mail-reader.c:2312
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2314
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2319
 msgid "_Save as mbox..."
 msgstr "_Sačuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2321
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2326
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2328
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2340
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2342
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2347
 msgid "_Normal Size"
-msgstr "_Normalna veličina"
+msgstr "_Uobičajena veličina"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2349
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2354
 msgid "_Zoom In"
-msgstr "Uv_ećaj"
+msgstr "U_većaj"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2356
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2361
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2363
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2196
-msgid "Create R_ule"
-msgstr "Napravi pra_vilo"
+#: ../mail/e-mail-reader.c:2370
+msgid "Cre_ate"
+msgstr "_Napravi"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2377
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2384
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2391
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2398
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2405
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2412
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2419
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../mail/e-mail-reader.c:2255
-msgid "Search Folder from Mailing _List..."
-msgstr "Fascikla pretrage sa dopisne _liste..."
+#: ../mail/e-mail-reader.c:2429
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2431
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2262
-msgid "Search Folder from Recipien_ts..."
-msgstr "Fascikla pretrage prima_laca..."
+#: ../mail/e-mail-reader.c:2436
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "Napravi fasciklu pretrage od pri_malaca..."
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2438
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:2269
-msgid "Search Folder from Sen_der..."
-msgstr "Fascikla pretrage _pošiljaoca..."
+#: ../mail/e-mail-reader.c:2443
+msgid "Create a Search Folder from Sen_der..."
+msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2445
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:2276
-msgid "Search Folder from S_ubject..."
-msgstr "Fascikla pretrage n_aslova..."
+#: ../mail/e-mail-reader.c:2450
+msgid "Create a Search Folder from S_ubject..."
+msgstr "Napravi fasciklu pretrage iz _naslova..."
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2452
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2475
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2487
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2491
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2495
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2499
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2503
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2547
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2549
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Prikazuje trepćući kursor u telu prikazanih poruka"
+msgstr "Prikažite trepćući kursor u telu prikazanih poruka"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2555
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2557
 msgid "Show messages with all email headers"
-msgstr "Prikazuje poruku sa svim zaglavljima e-pošte"
+msgstr "Prikažite poruku sa svim zaglavljima el. pošte"
 
-#: ../mail/e-mail-reader.c:2712
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "Dovlačim poruku „%s“"
+#: ../mail/e-mail-reader.c:2888
+msgid "Retrieving message"
+msgstr "Dovlačim poruku"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:3860
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3861
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3880
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3881
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3938 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:3971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:3975
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3984 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4714
 #, c-format
 msgid "Folder '%s'"
 msgstr "Fascikla „%s“"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:154
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
+#: ../mail/e-mail-reader-utils.c:949
+msgid "Printing"
+msgstr "Štampam"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:641
+#: ../mail/e-mail-reader-utils.c:1130
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11983,7 +12243,7 @@ msgstr[3] ""
 "Fascikla „%s“ sadrži %u dupliranu poruku. Da li ste sigurni da želite da je "
 "izbrišete?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1534
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Sačuvaj poruku"
@@ -11996,7 +12256,7 @@ msgstr[3] "Sačuvaj poruku"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1555
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
@@ -12004,158 +12264,26 @@ msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
 
+#: ../mail/e-mail-reader-utils.c:2010
+msgid "Parsing message"
+msgstr "Obrađujem poruku"
+
+#: ../mail/e-mail-request.c:153
+#, c-format
+msgid "Failed to load part '%s'"
+msgstr "Nisam uspeo da učitam deo „%s“"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
-#: ../mail/e-mail-ui-session.c:534 ../mail/mail-vfolder.c:1115
-msgid "Search Folders"
-msgstr "Fascikle pretrage"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Ništa"
-
-#: ../mail/em-account-editor.c:1753
-msgid "Always"
-msgstr "Uvek"
-
-#: ../mail/em-account-editor.c:1754
-msgid "Ask for each message"
-msgstr "Pitaj za svaku poruku"
-
-#: ../mail/em-account-editor.c:2905 ../mail/mail-config.ui.h:164
-msgid "_Path:"
-msgstr "_Putanja:"
-
-#: ../mail/em-account-editor.c:2908
-msgid "Fil_e:"
-msgstr "Dato_teka:"
-
-#: ../mail/em-account-editor.c:2945
-msgid "Mail Configuration"
-msgstr "Podešavanje pošte"
-
-#: ../mail/em-account-editor.c:2946
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"Dobrodošli u Pomoćnika podešavanja pošte Evolucije.\n"
-"\n"
-"Kliknite „Nastavi“ da započnete. "
-
-#: ../mail/em-account-editor.c:2949
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Unesite 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:2951 ../mail/em-account-editor.c:3160
-msgid "Receiving Email"
-msgstr "Primanje pošte"
-
-#: ../mail/em-account-editor.c:2952
-msgid "Please configure the following account settings."
-msgstr "Podesite sledeće postavke naloga."
-
-#: ../mail/em-account-editor.c:2954 ../mail/em-account-editor.c:3779
-msgid "Sending Email"
-msgstr "Slanje pošte"
-
-#: ../mail/em-account-editor.c:2955
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
-"pitajte administratora sistema ili dostavljača Internet usluga."
-
-#: ../mail/em-account-editor.c:2957
-msgid "Account Summary"
-msgstr "Sažetak naloga"
-
-#: ../mail/em-account-editor.c:2958
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-"Ovo je sažetak podešavanja koja će biti korišćena za pristup vašoj pošti."
-
-#: ../mail/em-account-editor.c:2962
-msgid "Done"
-msgstr "Urađeno"
-
-#: ../mail/em-account-editor.c:2963
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Čestitamo, podešavanje pošte je završeno.\n"
-"\n"
-"Sada ste spremni koristite Evoluciju za slanje i primanje pošte.\n"
-"\n"
-"Kliknite „Primeni“ da sačuvate postavke."
-
-#: ../mail/em-account-editor.c:3526
-msgid "Check for _new messages every"
-msgstr "Proveri za _novu poštu svakih"
-
-# bug: plural-forms
-#: ../mail/em-account-editor.c:3534
-msgid "minu_tes"
-msgstr "minu_ta"
-
-#: ../mail/em-account-editor.c:4252 ../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:4307 ../mail/em-account-editor.c:4409
-msgid "Receiving Options"
-msgstr "Opcije za primanje"
-
-#: ../mail/em-account-editor.c:4308 ../mail/em-account-editor.c:4410
-msgid "Checking for New Messages"
-msgstr "Proveranje za nove poruke"
-
-#: ../mail/em-account-editor.c:4913
-msgid "Setup Google con_tacts with Evolution"
-msgstr "Podesite Gugl ko_ntakte sa Evolucijom"
-
-#: ../mail/em-account-editor.c:4920
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "Podesite Gugl ka_lendar sa Evolucijom"
-
-#: ../mail/em-account-editor.c:4968
-msgid "Setup _Yahoo calendar with Evolution"
-msgstr "Podesite _Jahu kalendar sa Evolucijom"
-
-#: ../mail/em-account-editor.c:4993
-msgid "Yahoo Calen_dar name:"
-msgstr "Naziv Ja_hu kalendara:"
-
 # * each ${Variable} gets replaced with a value. To see a full list of available
 # * variables, see em-composer-utils.c:1514
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1215
+#: ../mail/em-composer-utils.c:1287
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12163,23 +12291,27 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../mail/em-composer-utils.c:1226
+#: ../mail/em-composer-utils.c:1293
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Prosleđena poruka --------"
+
+#: ../mail/em-composer-utils.c:1298
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2453
+#: ../mail/em-composer-utils.c:2578
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
-#: ../mail/em-composer-utils.c:2848
+#: ../mail/em-composer-utils.c:2996
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../mail/em-composer-utils.c:2849
+#: ../mail/em-composer-utils.c:2997
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
-#: ../mail/em-filter-folder-element.c:243
+#: ../mail/em-filter-editor-folder-element.c:156
 msgid "Select Folder"
 msgstr "Izaberi fasciklu"
 
@@ -12304,7 +12436,7 @@ msgstr "nije podešeno"
 msgid "is set"
 msgstr "podešeno"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:107
 msgid "Junk"
 msgstr "Đubre"
 
@@ -12314,7 +12446,7 @@ msgstr "Provera đubreta"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Label"
-msgstr "Etiketa"
+msgstr "Natpis"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Mailing list"
@@ -12353,7 +12485,7 @@ msgid "Play Sound"
 msgstr "Pusti zvuk"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Čitaj"
 
@@ -12430,20 +12562,20 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../mail/em-filter-i18n.h:77
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Color"
 msgstr "Nepostavljena boja"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Status"
 msgstr "Nepostavljen status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:527
+#: ../mail/em-filter-rule.c:581
 msgid "Then"
 msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:558
+#: ../mail/em-filter-rule.c:646
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
@@ -12485,17 +12617,17 @@ msgstr "Osobine fascikle"
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:389
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
-msgstr "Na_pravi"
+msgstr "_Napravi"
 
-#: ../mail/em-folder-selector.c:395
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
-msgstr "_Ime fascikle:"
+msgstr "Naziv _fascikle:"
 
 #: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
-msgstr "Imena fascikli ne mogu da sadrže „/“"
+msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 
 #: ../mail/em-folder-tree.c:783
 #, c-format
@@ -12503,41 +12635,41 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1606
+#: ../mail/em-folder-tree.c:1608
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2134 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2137 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2148 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2167
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruku(e) u ostavu na najvišem nivou"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
 msgid "Loading..."
 msgstr "Učitavam..."
 
@@ -12549,325 +12681,89 @@ msgstr "Premesti fasciklu u"
 msgid "Copy Folder To"
 msgstr "Umnoži fasciklu u"
 
-#: ../mail/em-folder-utils.c:601
+#: ../mail/em-folder-utils.c:586
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:602
+#: ../mail/em-folder-utils.c:587
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "Oblikovanje poruke"
-
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "Oblikujem poruku..."
-
-#: ../mail/em-format-html.c:1640 ../mail/em-format-html.c:1654
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Dovlačim „%s“"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "Nepotpisano"
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "Ispravan potpis"
-
-#: ../mail/em-format-html.c:1807 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "Neispravan potpis"
-
-#: ../mail/em-format-html.c:1808 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "Ispravan potpis, ali ne mogu da proverim pošiljaoca"
-
-#: ../mail/em-format-html.c:1809 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "Potpis postoji, ali traži javni ključ"
-
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "Nešifrovano"
-
-#: ../mail/em-format-html.c:1816 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "Šifrovano, slabo"
-
-#: ../mail/em-format-html.c:1817 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "Šifrovano"
-
-#: ../mail/em-format-html.c:1818 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "Šifrovano, jako"
-
-#: ../mail/em-format-html.c:2211
-msgid "Unknown external-body part."
-msgstr "Nepoznat spoljni deo poruke."
-
-#: ../mail/em-format-html.c:2221
-msgid "Malformed external-body part."
-msgstr "Loše složen spoljni deo poruke."
-
-#: ../mail/em-format-html.c:2252
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP stranicu (%s)"
-
-#: ../mail/em-format-html.c:2263
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara stranici „%s“"
-
-#: ../mail/em-format-html.c:2265
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pokazivač na lokalnu datoteku (%s)"
-
-#: ../mail/em-format-html.c:2286
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na udaljeni podatak (%s)"
-
-#: ../mail/em-format-html.c:2301
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:3009
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "Šalje: %s"
-
-#: ../mail/em-format-html.c:3031
-msgid "(no subject)"
-msgstr "(bez naslova)"
-
-#: ../mail/em-format-html.c:3107
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "Poruku šalje „%s“ na ime „%s“"
-
-#: ../mail/em-format-html-display.c:97
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
-
-#: ../mail/em-format-html-display.c:98
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
-"verovatno verodostojan."
-
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
-
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
-"biti proveren."
-
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr "Ova poruka je potpisana, ali nema odgovarajućeg javnog ključa."
-
-#: ../mail/em-format-html-display.c:108
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"Ova poruka nije šifrovana. Njen sadržaj je moguće videti u prenosu preko "
-"Interneta."
-
-#: ../mail/em-format-html-display.c:109
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"Ova poruka je šifrovana, ali slabim algoritmom.  Teško je, ali ne i nemoguće "
-"da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
-
-#: ../mail/em-format-html-display.c:110
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
-
-#: ../mail/em-format-html-display.c:111
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"Ova poruka je šifrovana, jakim algoritmom. Veoma je teško da neko sa strane "
-"u dogledno vreme vidi sadržaj ove poruke."
-
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
-msgid "_View Certificate"
-msgstr "Pre_gledaj uverenje"
-
-#: ../mail/em-format-html-display.c:274
-msgid "This certificate is not viewable"
-msgstr "Ovo uverenje nije čitljivo"
-
-#: ../mail/em-format-html-display.c:589
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolucija ne može da iscrta ovu poruku pošto je prevelika. Možete je "
-"pogledati kao neformatiranu ili pomoću drugog uređivača teksta."
-
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "Sačuvaj sliku"
-
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "Sačuvaj _sliku"
-
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "Sačuvajte sliku u datoteku"
-
-#: ../mail/em-format-html-display.c:1024
-msgid "Completed on"
-msgstr "Završeno za"
-
-#: ../mail/em-format-html-display.c:1036
-msgid "Overdue:"
-msgstr "Prekoračeno:"
-
-#: ../mail/em-format-html-display.c:1044
-msgid "by"
-msgstr "od"
-
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
-msgid "View _Unformatted"
-msgstr "Pregledaj _neformatirano"
-
-#: ../mail/em-format-html-display.c:1327
-msgid "Hide _Unformatted"
-msgstr "Sakrij _neformatirano"
-
-#: ../mail/em-format-html-display.c:1398
-msgid "O_pen With"
-msgstr "O_tvori pomoću"
-
-#. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
-msgctxt "Button"
-msgid "Attachment"
-msgstr "Prilog"
-
-#: ../mail/em-format-html-print.c:157
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d. strana od %d"
-
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "Nije dostupan HTML tok."
-
-#: ../mail/em-subscription-editor.c:870
+#: ../mail/em-subscription-editor.c:869
 msgid "_Subscribe"
 msgstr "Prijavi _se"
 
-#: ../mail/em-subscription-editor.c:879
+#: ../mail/em-subscription-editor.c:878
 msgid "Su_bscribe To Shown"
 msgstr "Prijavi se na _prikazane"
 
-#: ../mail/em-subscription-editor.c:887
+#: ../mail/em-subscription-editor.c:886
 msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../mail/em-subscription-editor.c:996
+#: ../mail/em-subscription-editor.c:995
 msgid "Unsu_bscribe From Hidden"
 msgstr "O_djavi se sa skrivenih"
 
-#: ../mail/em-subscription-editor.c:1004
+#: ../mail/em-subscription-editor.c:1003
 msgid "Unsubscribe From _All"
 msgstr "Odja_vi se sa svih"
 
-#: ../mail/em-subscription-editor.c:1675
+#: ../mail/em-subscription-editor.c:1679
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/em-subscription-editor.c:1715
+#: ../mail/em-subscription-editor.c:1719
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../mail/em-subscription-editor.c:1730
+#: ../mail/em-subscription-editor.c:1734
 msgid "Clear Search"
 msgstr "Očisti pretragu"
 
-#: ../mail/em-subscription-editor.c:1748
+#: ../mail/em-subscription-editor.c:1752
 msgid "Sho_w items that contain:"
 msgstr "_Prikaži stavke koje sadrže:"
 
-#: ../mail/em-subscription-editor.c:1793
+#: ../mail/em-subscription-editor.c:1797
 msgid "Subscribe to the selected folder"
 msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../mail/em-subscription-editor.c:1794
+#: ../mail/em-subscription-editor.c:1798
 msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../mail/em-subscription-editor.c:1843
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../mail/em-subscription-editor.c:1879
+#: ../mail/em-subscription-editor.c:1883
 msgid "Collapse all folders"
 msgstr "Skupite sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1880
+#: ../mail/em-subscription-editor.c:1884
 msgid "C_ollapse All"
 msgstr "_Skupi sve"
 
-#: ../mail/em-subscription-editor.c:1890
+#: ../mail/em-subscription-editor.c:1894
 msgid "Expand all folders"
 msgstr "Razgranajte sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1891
+#: ../mail/em-subscription-editor.c:1895
 msgid "E_xpand All"
 msgstr "_Razgranaj sve"
 
-#: ../mail/em-subscription-editor.c:1901
+#: ../mail/em-subscription-editor.c:1905
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../mail/em-subscription-editor.c:1913
+#: ../mail/em-subscription-editor.c:1917
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
@@ -12875,7 +12771,7 @@ msgstr "Zaustavite trenutnu operaciju"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:110
+#: ../mail/em-utils.c:106
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -12884,16 +12780,16 @@ msgstr[1] "Sigurno želite da otvorite %d poruke odjednom?"
 msgstr[2] "Sigurno želite da otvorite %d poruka odjednom?"
 msgstr[3] "Sigurno želite da otvorite ovu jednu poruku?"
 
-#: ../mail/em-utils.c:166
+#: ../mail/em-utils.c:162
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
-msgstr "_Ne prikazuj ponovo ovu poruku."
+msgstr "_Ne prikazuj više ovu poruku"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filteri poruka"
 
-#: ../mail/em-utils.c:978
+#: ../mail/em-utils.c:1064
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke koje je poslao %s"
@@ -12902,405 +12798,71 @@ msgstr "Poruke koje je poslao %s"
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-rule.c:601
+#: ../mail/em-vfolder-editor-rule.c:388
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
-msgstr ""
-"Digitalno potpisivanje poruka kada je originalna poruka potpisana (PGP ili S/"
-"MIME)"
-
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Composer Window default width"
-msgstr "Osnovna širina za prozor sastavljača"
-
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default width of the Composer Window."
-msgstr "Podrazumevana širina prozora sastavljača."
-
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Composer Window default height"
-msgstr "Podrazumevana visina prozora sastavljača"
-
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default height of the Composer Window."
-msgstr "Podrazumevana visina prozora sastavljača."
-
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid "Attribute message."
-msgstr "Priložena poruka."
-
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr ""
-"Tekst koji se ubacuje kada odgovarate na poruku, pripisujući poruku "
-"originalnom autoru."
-
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Forward message."
-msgstr "Prosleđuje poruku."
-
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-"Tekst koji se ubacuje prilikom prosleđivanja poruke, koji je rekao da "
-"prosleđena poruka sledi."
-
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Original message."
-msgstr "Originalna poruka."
-
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-"Tekst koji se ubacuje prilikom prosleđivanja poruke (objava pri vrhu), koji "
-"je rekao da prosleđena poruka sledi."
-
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-"Ova vrednost može biti prazna niska, što znači da će koristiti sistemsku "
-"fasciklu sa slikama, obično podešena na ~/Slike. Ova fascikla će se takođe "
-"koristi kada podešena putanja ne ukazuje na postojeću fasciklu."
-
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid "Whether to show local folders (On This Computer) in a folder tree."
-msgstr ""
-"Da li da prikaže lokalne fascikle (Na ovom računaru) u stablu fascikle."
-
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-"Ovo podešavanje određuje da li će niti podrazumevano biti raširene ili "
-"skupljene. Evolucija zahteva ponovno pokretanje."
-
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
-"Opisuje da li zaglavlja poruke u pregledu površi treba da budu skupljena ili "
-"raširena po osnovnoj vrednosti. 0 = raširena, 1 = skupljena"
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr ""
-"Kazuje kako će biti poređani nalozi u stablu fascikle korišćeni u pregledu "
-"pošte. Kada je izabrano nalozi bivaju poređani po azbučnom redu, sa "
-"izuzetkom fascikli „Na ovom računaru“ i „Potraži“, u suprotnom nalozi bivaju "
-"poređani na osnovu poretka koji je zadao korisnik."
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mail browser width"
-msgstr "Širina pregledača pošte"
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Default width of the mail browser window."
-msgstr "Podrazumevana širina prozora pregledača pošte."
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mail browser height"
-msgstr "Visina pregledača pošte"
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Default height of the mail browser window."
-msgstr "Podrazumevana visina prozora pregledača pošte."
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Mail browser maximized"
-msgstr "Uvećan pregledač pošte"
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Default maximized state of the mail browser window."
-msgstr "Podrazumevano stanje uvećanog prozora pregledača pošte."
-
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "\"Folder Subscriptions\" window height"
-msgstr "Visina prozora „Prijavljivanje na fascikle“"
-
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Početna visina prozora „Prijavljivanje na fascikle“. Vrednost se ažurira "
-"ukoliko korisnik produži prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Stanje uvećanog prozora „Prijavljivanje na fascikle“"
-
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Početno stanje uvećanog prozora „Prijavljivanje na fascikle“. Vrednost se "
-"ažurira ukoliko korisnik uveća ili umanji prozor. Primetite da Evolucija ne "
-"koristi ovu vrednost pošto ovaj prozor ne može biti uvećan. Ovaj ključ samo "
-"upotpunjuje postavke."
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "\"Folder Subscriptions\" window width"
-msgstr "Širina prozora „Prijavljivanje na fascikle“"
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Početna širina prozora „Prijavljivanje na fascikle“. Vrednost se ažurira "
-"ukoliko korisnik proširi prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Default reply style"
-msgstr "Podrazumevani stil odgovora"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-"Moguće vrednosti su: „never“ — da nikada ne zatvori prozor pretraživača; "
-"„always“ — da uvek zatvori prozor pretraživača i „ask“ — (ili bilo koja "
-"druga vrednost) pitaće korisnika"
-
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid "List of accounts"
-msgstr "Spisak naloga"
-
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Spisak naloga koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
-"koje imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
-
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "List of accepted licenses"
-msgstr "Spisak prihvaćenih licenci"
-
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid "List of protocol names whose license has been accepted."
-msgstr "Spisak imena protokola čija je licenca prihvaćena."
-
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid "\"Filter Editor\" window height"
-msgstr "Visina prozora uređivača filtera"
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"Početna visina prozora uređivača filtera. Vrednost se ažurira ukoliko "
-"korisnik izduži prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "\"Filter Editor\" window maximize state"
-msgstr "Stanje uvećanog prozora uređivača filtera"
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"Početno stanje uvećanog prozora uređivača filtera. Vrednost se ažurira "
-"ukoliko korisnik uveća ili umanji prozor. Znajte da Evolucija ne koristi ovu "
-"vrednost pošto ovaj prozor ne može biti uvećan. Ovaj ključ samo upotpunjuje "
-"postavke."
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "\"Filter Editor\" window width"
-msgstr "Širina prozora uređivača filtera"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Početna širina prozora uređivača filtera. Vrednost se ažurira ukoliko "
-"korisnik raširi prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"Da li će vršiti proveru za novim porukama prilikom pokretanja Evolucije. Ovo "
-"uključuje i slanje poruka iz fascikle Poslato."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Da li će vršiti proveru za novim porukama u svim aktivnim nalozima bez "
-"obzira na opciju naloga „Proveri za novim porukama svakih H minuta“ prilikom "
-"pokretanja Evolucije. Ova opcija se koristi samo zajedno sa "
-"„send_recv_on_start“ (pošalji_primi_pri_pokretanju) opcijom."
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "\"Send and Receive Mail\" window height"
-msgstr "Visina prozora za slanje i primanje pošte"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Početna visina prozora slanja i primanja pošte. Vrednost se ažurira ukoliko "
-"korisnik produži prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "Uvećanje prozora za slanje i primanje pošte"
-
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Početna veličina uvećanog prozora slanja i primanja pošte. Vrednost se ažurira "
-"ukoliko korisnik uveća ili umanji prozor. Znajte da Evolucija ne koristi ovu "
-"vrednost pošto ovaj prozor ne može biti uvećan. Ova vrednost samo upotpunjuje "
-"postavke."
-
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "\"Send and Receive Mail\" window width"
-msgstr "Širina prozora za slanje i primanje pošte"
-
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Početna širina prozora slanja i primanja pošte. Vrednost se ažurira ukoliko "
-"korisnik raširi prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid "\"Search Folder Editor\" window height"
-msgstr "Visina prozora uređivača fascikle pretrage"
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Početna visina prozora uređivača fascikle pretrage. Vrednost se ažurira "
-"ukoliko korisnik izduži prozor."
-
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Stanje uvećanog prozora uređivača fascikle pretrage"
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Početno stanje uvećanog prozora uređivača fascikle pretrage. Vrednost se "
-"ažurira ukoliko korisnik uveća ili umanji prozor. Znajte da Evolucija ne "
-"koristi ovu vrednost pošto ovaj prozor ne može biti uvećan. Ovaj ključ samo "
-"upotpunjuje postavke."
+#: ../mail/em-vfolder-editor-rule.c:514
+msgid "Search Folder Sources"
+msgstr "Izvor fascikle pretrage"
 
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid "\"Search Folder Editor\" window width"
-msgstr "Širina prozora uređivača fascikle pretrage"
+#: ../mail/em-vfolder-editor-rule.c:544
+msgid "Automatically update on any _source folder change"
+msgstr "Sam osveži pri _svakoj izmeni izvorne fascikle"
 
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Početna širina prozora uređivača fascikle pretrage. Vrednost se ažurira "
-"ukoliko korisnik raširi prozor."
+#: ../mail/em-vfolder-editor-rule.c:556
+msgid "All local folders"
+msgstr "Sve lokalne fascikle"
 
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Drag'n'drop export format"
-msgstr "Oblik izvoženja „prevuci i ubaci“"
+#: ../mail/em-vfolder-editor-rule.c:557
+msgid "All active remote folders"
+msgstr "Sve aktivne mrežne fascikle"
 
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid ""
-"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“"
+#: ../mail/em-vfolder-editor-rule.c:558
+msgid "All local and active remote folders"
+msgstr "Sve lokalne i aktivne mrežne fascikle"
 
-#: ../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/em-vfolder-editor-rule.c:559
+msgid "Specific folders"
+msgstr "Određene fascikle"
 
-#: ../mail/evolution-mail.schemas.in.h:238
-msgid ""
-"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 "
-"su: 1 (: datum slanja el. pošte), 2 (: datum prevlačenja i ubacivanja)"
+#: ../mail/em-vfolder-editor-rule.c:594
+msgid "include subfolders"
+msgstr "uključi podfascikle"
 
-#: ../mail/importers/elm-importer.c:181
+#: ../mail/importers/elm-importer.c:179
 msgid "Importing Elm data"
 msgstr "Uvoženje Elm podataka"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1042
+#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
+#: ../modules/mail/e-mail-shell-view.c:1071
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../mail/importers/elm-importer.c:400
+#: ../mail/importers/elm-importer.c:379
 msgid "Evolution Elm importer"
 msgstr "Elm uvoznik Evolucije"
 
-#: ../mail/importers/elm-importer.c:401
+#: ../mail/importers/elm-importer.c:380
 msgid "Import mail from Elm."
 msgstr "Uvozi poštu iz Elma."
 
 #: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/dbx-import/dbx-importer.c:255
 msgid "_Destination folder:"
 msgstr "_Odredišna fascikla:"
 
 #: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:557
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
 #: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../plugins/dbx-import/dbx-importer.c:262
+#: ../plugins/pst-import/pst-importer.c:571
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
@@ -13329,8 +12891,8 @@ msgstr "Uvoženje poštanskog sandučeta"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:621
-#: ../plugins/pst-import/pst-importer.c:770
+#: ../plugins/dbx-import/dbx-importer.c:616
+#: ../plugins/pst-import/pst-importer.c:784
 #, c-format
 msgid "Importing '%s'"
 msgstr "Uvozim „%s“"
@@ -13340,20 +12902,19 @@ msgstr "Uvozim „%s“"
 msgid "Scanning %s"
 msgstr "Pretražujem „%s“"
 
-#: ../mail/importers/pine-importer.c:262
+#: ../mail/importers/pine-importer.c:251
 msgid "Importing Pine data"
 msgstr "Uvoženje Pine podatke"
 
-#: ../mail/importers/pine-importer.c:467
-#: ../modules/addressbook/addressbook-config.c:1115
+#: ../mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Adresar"
 
-#: ../mail/importers/pine-importer.c:515
+#: ../mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Pine uvoznik Evolucije"
 
-#: ../mail/importers/pine-importer.c:516
+#: ../mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Uvozi poštu iz programa Pine."
 
@@ -13417,7 +12978,7 @@ msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
-"Sve nove e-poruke sa zaglavljem koje se podudara sa datim sadržajem će biti "
+"Sve nove el. poruke sa zaglavljem koje se podudara sa datim sadržajem će biti "
 "automatski filtrirane kao neželjene"
 
 #: ../mail/mail-config.ui.h:3
@@ -13429,785 +12990,470 @@ msgid "Header content"
 msgstr "Zaglavlje sadrži"
 
 #: ../mail/mail-config.ui.h:5
-msgid "_Add Signature"
-msgstr "_Dodaj potpis"
-
-#: ../mail/mail-config.ui.h:6
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"Izlaz ove skripte će biti korišćen kao\n"
-"potpis. Ime koje ste dali biće korišćeno\n"
-"samo za prikazivanje na ekranu. "
-
-#: ../mail/mail-config.ui.h:10
-msgid "_Script:"
-msgstr "_Skripta:"
-
-#: ../mail/mail-config.ui.h:11
 msgid "Default Behavior"
 msgstr "Podrazumevano ponašanje"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:6
 msgid "For_mat messages in HTML"
 msgstr "Oblikuj poruke u HTM_L"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:7
 msgid "Automatically insert _emoticon images"
 msgstr "Uvek umetni slike _smajlića"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:8
 msgid "Always request rea_d receipt"
 msgstr "Uvek traži _povratnicu"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:9
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodiraj nazive datoteka na način _Autluka/Gpošte"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:10
 msgid "Ch_aracter encoding:"
 msgstr "Kodna st_rana:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:11
 msgid "Replies and Forwards"
 msgstr "Odgovori i prosleđivanja"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
 msgstr "U odgovoru započni _kucanje pri dnu"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:15
 msgid "_Keep signature above the original message on replying"
 msgstr "Zadrži potpis _iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:16
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Zanemari „Odgovor-za:“ za dopisne liste"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:17
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Odgovor _grupi ide samo na dopisnu listu, ako je moguće"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:18
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Digitalno _potpiši poruke kada je originalna poruka potpisana (PGP ili S/"
 "MIME)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:20
 msgid "Sig_natures"
 msgstr "Pot_pisi"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:21
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:22
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:23
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Lista jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
+"Spisak jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:24
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:27
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
-msgstr "Bira boju"
+msgstr "Izaberite boju"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:29
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:30
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
-"Da biste izbegli nepogodnosti i nelagodnost e-pošte, pitajte za potvrdu pre "
-"izvršavanja sledećih označenih radnji:"
+"Da biste izbegli nepogodnosti i nelagodnost el. pošte, pitajte za potvrdu "
+"pre izvršavanja sledećih označenih radnji:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:32
 msgid "Sending a message with an _empty subject line"
 msgstr "Slanja poruke sa praznom linijom _naslova"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:34
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Slanja poruke koja sadrži određene samo _Bcc primaoce"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:36
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Slanja privatnog _odgovora na poruku dopisne liste"
 
 # bug(slobo): verovatno izveštaj o dostavi
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:38
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Slanja odgovora _većem broju primalaca"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:40
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Dozvoljavanja _dopisnoj listi da preusmeri privatnu poruku na listu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Slanja poruke sa _primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:43
 msgid "Confirmations"
 msgstr "Potvrđivanja"
 
-#: ../mail/mail-config.ui.h:52
-msgid "SHA1"
-msgstr "SHA1"
-
-#: ../mail/mail-config.ui.h:53
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:54
-msgid "SHA384"
-msgstr "SHA384"
-
-#: ../mail/mail-config.ui.h:55
-msgid "SHA512"
-msgstr "SHA512"
-
-#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Priloži"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Autluk stil)"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgctxt "ReplyForward"
 msgid "Do not quote"
 msgstr "Ne citiraj"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:55
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
-msgstr "Postavke mrežnog posrednika"
+msgstr "Podešavanja posrednika"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:57
 msgid "_Use system defaults"
 msgstr "_Koristi sistemske postavke"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:58
 msgid "_Direct connection to the Internet"
 msgstr "_Direktna veza sa Internetom"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:59
 msgid "_Manual proxy configuration:"
 msgstr "_Ručno podešavanje posrednika:"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:60
 msgid "H_TTP Proxy:"
 msgstr "HTTP _posrednik:"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:61
 msgid "_Secure HTTP Proxy:"
 msgstr "_Bezbedan HTTP posrednik:"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "SOC_KS Proxy:"
-msgstr "Posrednik SOCKS-a:"
+msgstr "Posrednik _SOCKS-a:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "No _Proxy for:"
 msgstr "Bez _posrednika za:"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Use Authe_ntication"
 msgstr "Koristi _potvrđivanje identiteta"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Us_ername:"
 msgstr "Korisničko_ime:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:67
 msgid "Pass_word:"
 msgstr "_Lozinka:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:68
 msgid "Start up"
 msgstr "Pokretanje"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:69
 msgid "Check for new _messages on start"
 msgstr "Proveri nove _poruke prilikom pokretanja"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:70
 msgid "Check for new messa_ges in all active accounts"
-msgstr "Proveri nove poruke u svim aktivnim nalozima"
+msgstr "Proveri nove _poruke u svim aktivnim nalozima"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:72
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:73
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:74
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML font stalne veličine"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:75
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML font promenljive veličine"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:76
 msgid "Fix_ed Width Font:"
 msgstr "Font _stalne širine:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:77
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:78
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:79
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:80
 msgid "Apply the same _view settings to all folders"
 msgstr "Primeni ista podešavanja _pregleda na svim fasciklama"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:81
 msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:82
 msgid "Delete Mail"
 msgstr "Obriši poštu"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni fascikle sa _smećem kada izađeš"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:84
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:86
 msgid "_Show animated images"
 msgstr "Prikaži _animirane slike"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:87
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Upozori pri slanju HTML pošte kontaktima koji ih ne žele"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:88
 msgid "Loading Images"
 msgstr "Učitavanje slika"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:89
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:90
 msgid "_Load images only in messages from contacts"
 msgstr "_Učitaj slike samo u porukama od kontakta"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:91
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:92
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:94
 msgid "Sender Photograph"
 msgstr "Fotografija pošiljaoca"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:95
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Tr_aži fotografiju pošiljaoca samo u lokalnim adresarima"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:97
 msgid "Displayed Message Headers"
-msgstr "Prikazana _zaglavlja poruka"
+msgstr "Prikazana zaglavlja poruka"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:98
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:188
+#: ../mail/mail-config.ui.h:99
+#: ../modules/addressbook/autocompletion-config.c:90
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
 
-#: ../mail/mail-config.ui.h:107
-msgid "Headers"
-msgstr "Zaglavlja"
-
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:101
 msgid "Check incoming _messages for junk"
 msgstr "Proveri ima li đubreta u _pristigloj pošti"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:102
 msgid "Delete junk messages on e_xit"
 msgstr "Obriši đubre pri i_zlazu"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:103
 msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:104
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ne označava_j poruke kao đubre ako je pošiljalac u mom adresaru"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:105
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom adresaru"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:106
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Opcija se zanemaruje ukoliko je pronađeno poklapanje sa proizvoljnim zaglavljem "
 "đubreta."
 
-#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:108 ../modules/addressbook/ldap-config.ui.h:3
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:160
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
-#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:109 ../modules/addressbook/ldap-config.ui.h:1
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
-#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:2
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
-#: ../mail/mail-config.ui.h:118
-msgid "Special Folders"
-msgstr "Posebne fascikle"
-
-#: ../mail/mail-config.ui.h:119
-msgid "Drafts _Folder:"
-msgstr "_Fascikla nacrta:"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Sent _Messages Folder:"
-msgstr "Fascikla poslatih _poruka:"
-
-#: ../mail/mail-config.ui.h:121
-msgid "_Trash Folder:"
-msgstr "Fascikla za _smeće:"
-
-# bug: requires a comment on usage
-#: ../mail/mail-config.ui.h:122
-msgid "_Junk Folder:"
-msgstr "Fascikla za _đubre:"
-
-#: ../mail/mail-config.ui.h:123
-msgid "Composing Messages"
-msgstr "Sastavljanje poruka"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
-
-#: ../mail/mail-config.ui.h:125
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Uvek pošalji _grafitnu kopiju (cc):"
-
-#: ../mail/mail-config.ui.h:126
-msgid "Message Receipts"
-msgstr "Priznanice poruke"
-
-#: ../mail/mail-config.ui.h:127
-msgid "S_end message receipts:"
-msgstr "_Pošalji povratnice:"
-
-#: ../mail/mail-config.ui.h:128
-msgid "Account Information"
-msgstr "Podaci o nalogu"
-
-#: ../mail/mail-config.ui.h:129
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"Ukucajte ime po kome želite da nazovete ovaj nalog.\n"
-"Na primer: „Poslovni“ ili „Lični“"
-
-#: ../mail/mail-config.ui.h:131
-msgid "Required Information"
-msgstr "Obavezni podaci"
-
-#: ../mail/mail-config.ui.h:132
-msgid "Email _Address:"
-msgstr "Adresa _e-pošte:"
-
-#: ../mail/mail-config.ui.h:133
-msgid "Full Nam_e:"
-msgstr "Ime i prezime:"
-
-#: ../mail/mail-config.ui.h:134
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "Optional Information"
-msgstr "Dodatni podaci"
-
-#: ../mail/mail-config.ui.h:135
-msgid "Signat_ure:"
-msgstr "Potp_is:"
-
-#: ../mail/mail-config.ui.h:136
-msgid "Add Ne_w Signature..."
-msgstr "Dodaj no_vi potpis..."
-
-#: ../mail/mail-config.ui.h:137
-msgid "Or_ganization:"
-msgstr "Or_ganizacija:"
-
-#: ../mail/mail-config.ui.h:138
-msgid "Re_ply-To:"
-msgstr "Od_govor:"
-
-#: ../mail/mail-config.ui.h:139
-msgid "_Make this my default account"
-msgstr "_Neka ovo bude moj podrazumevani nalog"
-
-#: ../mail/mail-config.ui.h:140
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Ne potpisuj zahteve za s_astanke (Autluk kompatibilnost)"
-
-#: ../mail/mail-config.ui.h:141
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Prilično dobra privatnost (PGP/GPG)"
-
-#: ../mail/mail-config.ui.h:142
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG IB _ključa:"
-
-#: ../mail/mail-config.ui.h:143
-msgid "Si_gning algorithm:"
-msgstr "Algoritam _potpisivanja:"
-
-#: ../mail/mail-config.ui.h:144
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "_Uvek potpiši odlazeće poruke sa ovog naloga"
-
-#: ../mail/mail-config.ui.h:145
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Uv_ek i meni šifruj pri slanju šifrovane pošte"
-
-#: ../mail/mail-config.ui.h:146
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Uvek _veruj ključevima mog priveska pri šifrovanju"
-
-#: ../mail/mail-config.ui.h:147
-msgid "Secure MIME (S/MIME)"
-msgstr "Sigurni MIME (S/MIME)"
-
-#: ../mail/mail-config.ui.h:148
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "_Takođe šifruj sebi pri slanju šifrovane pošte"
-
-#: ../mail/mail-config.ui.h:149
-msgid "Encrypt out_going messages (by default)"
-msgstr "_Šifruj odlazeće poruke (podrazumevano)"
-
-#: ../mail/mail-config.ui.h:150
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Digitalno potpiši od_lazne poruke (podrazumevano)"
-
-#: ../mail/mail-config.ui.h:151
-msgid "Encry_ption certificate:"
-msgstr "Uverenje za ši_frovanje:"
-
-#: ../mail/mail-config.ui.h:152
-msgid "Sig_ning certificate:"
-msgstr "Uverenje _potpisivanja:"
-
-#: ../mail/mail-config.ui.h:153
-msgid "S_elect..."
-msgstr "Izab_eri..."
-
-#: ../mail/mail-config.ui.h:154
-msgid "Clea_r"
-msgstr "Očis_ti"
-
-#: ../mail/mail-config.ui.h:155
-msgid "Signing _algorithm:"
-msgstr "Algoritam p_otpisa:"
-
-#: ../mail/mail-config.ui.h:157
-msgid "Cle_ar"
-msgstr "Oči_sti"
-
-#: ../mail/mail-config.ui.h:158
-msgid "Server _Type:"
-msgstr "_Tip servera:"
-
-#: ../mail/mail-config.ui.h:160
-msgid "description"
-msgstr "opis"
-
-#: ../mail/mail-config.ui.h:161
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "Podešavanje"
-
-#: ../mail/mail-config.ui.h:162
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "S_erver:"
-
-#: ../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:272
-msgid "User_name:"
-msgstr "Korisničko_ime:"
-
-#: ../mail/mail-config.ui.h:165
-msgid "Mailbox location"
-msgstr "Lokacija poštanskog sandučeta"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Use secure connection:"
-msgstr "_Koristi sigurnu vezu:"
-
-#: ../mail/mail-config.ui.h:168
-msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL nije podržan u ovom izdanju Evolucije"
-
-#: ../mail/mail-config.ui.h:169
-msgid "_Authentication Type"
-msgstr "Tip po_tvrđivanja identiteta"
-
-#: ../mail/mail-config.ui.h:170
-msgid "Ch_eck for Supported Types"
-msgstr "_Proveri podržane tipove"
-
-#: ../mail/mail-config.ui.h:171
-msgid "Re_member password"
-msgstr "Z_apamti lozinku"
-
-#: ../mail/mail-config.ui.h:172
-msgid "Server Configuration"
-msgstr "Podešavanje servera"
-
-#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../mail/mail-config.ui.h:174
-msgid "Ser_ver requires authentication"
-msgstr "Ser_ver traži potvrđivanje identiteta"
-
-#: ../mail/mail-config.ui.h:175
-#: ../modules/addressbook/addressbook-config.c:1122
-msgid "Authentication"
-msgstr "Potvrđivanje identiteta"
-
-#: ../mail/mail-config.ui.h:176
-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:179
-msgid "Personal Details:"
-msgstr "Lični podaci:"
-
-#: ../mail/mail-config.ui.h:188
-msgid "Encryption:"
-msgstr "Šifrovanje:"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#: ../mail/mail-config.ui.h:189
-msgid "none"
-msgstr "ništa"
-
-#: ../mail/mail-config.ui.h:190
-msgid "label"
-msgstr "natpis"
-
 #: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "Izvor fascikle pretrage"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "Sve lokalne fascikle"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "Sve aktivne mrežne fascikle"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "Sve lokalne i aktivne mrežne fascikle"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "Određene fascikle"
-
-#: ../mail/mail-dialogs.ui.h:6
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "Poruke koje ste izabrali za praćenje su dole izlistane.\n"
-"Izaberite radnju za izvršavanje iz menija „Oznake“."
+"Izaberite radnju za izvršavanje iz izbornika „Oznake“."
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
 msgid "_Flag:"
 msgstr "_Oznaka:"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
 msgid "_Due By:"
 msgstr "_Rok:"
 
 # timezone.
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Za_vršeno"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Call"
 msgstr "Poziv"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ne prosleđuj"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Review"
-msgstr "Pročitati"
+msgstr "Pregledaj"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
-msgstr "Ugovor o licenci"
+msgstr "Ugovor o korišćenju"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_načite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Podaci bezbednosti"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "Digitalni potpis"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "Šifrovanje"
 
@@ -14276,9 +13522,9 @@ msgid ""
 msgstr ""
 "Kontakat lista kojoj šaljete je podešena da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje ima samo "
-"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
-"Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ primaoca."
+"Mnogi sistemi el. pošte dodaju porukama zaglavlje „Prividno-ka“ koje ima samo "
+"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce "
+"poruke. Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ primaoca. "
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
@@ -14287,10 +13533,10 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje imaju samo "
-"BCC primaoce. Ovo će zaglavlje, ako je dodato, u svakom slučaju izlistati sve "
-"primaoce poruke. Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ "
-"primaoca."
+"Mnogi sistemi el. pošte dodaju porukama zaglavlje „Prividno-ka“ koje imaju "
+"samo BCC primaoce. Ovo će zaglavlje, ako je dodato, u svakom slučaju "
+"izlistati sve primaoce poruke. Da izbegnete ovo, dodajte barem jednog "
+"„Prima:“ ili „CC:“ primaoca."
 
 # mail:ask-send-only-bcc primary
 #: ../mail/mail.error.xml.h:16
@@ -14302,7 +13548,7 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"Sledeći primalac nije prepoznat kao ispravna adresa e-pošte:\n"
+"Sledeći primalac nije prepoznat kao ispravna adresa el. pošte:\n"
 "{0}"
 
 # mail:ask-send-only-bcc primary
@@ -14315,7 +13561,7 @@ msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"Sledeći primaoci nisu prepoznati kao ispravne adrese e-pošte:\n"
+"Sledeći primaoci nisu prepoznati kao ispravne adrese el. pošte:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:22
@@ -14369,8 +13615,8 @@ msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Unesite važeću adresu e-pošte u polje „Prima:“. Možete pretražiti adrese e-"
-"pošte klikom na dugme „Prima:“ pored polja za unos."
+"Unesite važeću adresu el. pošte u polje „Prima:“. Možete pretražiti adrese "
+"el. pošte klikom na dugme „Prima:“ pored polja za unos."
 
 #: ../mail/mail.error.xml.h:32
 msgid "Use default drafts folder?"
@@ -14386,7 +13632,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:34
 msgid "Use _Default"
-msgstr "Koristi _podrazumevano"
+msgstr "Koristi _osnovno"
 
 #: ../mail/mail.error.xml.h:35
 msgid ""
@@ -14412,9 +13658,9 @@ 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:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "_Empty Trash"
-msgstr "Isprazni _Smeće"
+msgstr "_Izbaci smeće"
 
 #: ../mail/mail.error.xml.h:40
 msgid "Opening too many messages at once may take a long time."
@@ -14475,7 +13721,7 @@ msgstr "Ne mogu da napravim privremeni direktorijum za čuvanje."
 
 #: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
-msgstr "Datoteka postoji, nije moguće prepisivanje."
+msgstr "Datoteka postoji ali ne mogu da je prepišem."
 
 #: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
@@ -14500,14 +13746,26 @@ msgstr ""
 "biti preimenovane, premeštene ili obrisane."
 
 #: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "Nisam uspeo da izbacim fasciklu „{0}“."
+
+#: ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "Prijavljena greška bejaše „{1}“."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "Nisam uspeo da osvežim fasciklu „{0}“."
+
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Ne mogu da preimenujem ili da premestim sistemsku fasciklu„{0}“."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Da obrišem fasciklu „{0}“ i sve podfascikle?"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -14515,20 +13773,20 @@ msgstr ""
 "Ukoliko obrišete fasciklu, sav njen sadržaj i sadržaj podfascikli biće trajno "
 "obrisani."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "Da obrišem fasciklu „{0}“?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Ukoliko obrišete fasciklu, sav njen sadržaj biće trajno obrisan."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "These messages are not copies."
 msgstr "Ove poruke nisu umnošci."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -14539,69 +13797,69 @@ msgstr ""
 "kojima se fizički nalaze. Da li zaista želite da izbrišete ove poruke?"
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da preimenujem „{0}“ u „{1}“."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Fascikla sa imenom „{1}“ već postoji. Dodelite joj neki drugi naziv."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da premestim fasciklu „{0}“ u „{1}“."
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "Ne mogu da otvorim izvor „{2}“."
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "Ne mogu da otvorim cilj „{2}“."
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da umnožim fasciklu „{0}“ u „{1}“."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ne mogu da napravim fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "Ne mogu da otvorim izvor „{1}“"
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "Ne mogu da sačuvam izmene na nalogu."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete da napravite dva naloga sa istim imenom."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci o nalogu biće trajno obrisani."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Sigurno želite da obrišete ovaj nalog i sve pripadajuće elemente?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14609,53 +13867,29 @@ msgstr ""
 "Ukoliko nastavite, podaci o nalogu i svi\n"
 "podaci posrednika biće trajno obrisani."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Sigurno želite da isključite ovaj nalog i obrišete sve posrednike?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ako nastavite, svi nalozi posrednika biće trajno uklonjeni."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "Nemoj _isključiti"
 
-#: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:617
-msgid "_Disable"
-msgstr "_Onemogući"
-
-#: ../mail/mail.error.xml.h:88
-msgid "Could not save signature file."
-msgstr "Ne mogu da sačuvam datoteku potpisa."
-
-#: ../mail/mail.error.xml.h:89
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Ne mogu da postavim skriptu za potpis „{0}“."
-
 #: ../mail/mail.error.xml.h:90
-msgid "The script file must exist and be executable."
-msgstr "Datoteka skripte mora postojati i biti izvršna."
+#: ../plugins/publish-calendar/publish-calendar.c:628
+msgid "_Disable"
+msgstr "_Isključi"
 
 #: ../mail/mail.error.xml.h:91
-msgid "Do you wish to save your changes?"
-msgstr "Da li želite da sačuvate izmene?"
-
-#: ../mail/mail.error.xml.h:92
-msgid "This signature has been changed, but has not been saved."
-msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
-
-#: ../mail/mail.error.xml.h:93
-msgid "_Discard changes"
-msgstr "_Odbaci izmene"
-
-#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Ne mogu da uredim fasciklu pretrage „{0}“ jer ne postoji."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14663,39 +13897,39 @@ msgstr ""
 "Ova fascikla je možda posredno dodata,\n"
 "idite u uređivač fascikle pretrage i dodajte je izričito, ako želite."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Ne mogu da dodam fasciklu pretrage „{0}“."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Fascikla sa imenom „{0}“ već postoji. Dodelite joj neki drugi naziv."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "Fascikle pretrage su automatski ažurirane."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "Filteri pošte su automatski ažurirani."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "Nedostajuća fascikla."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "Morate da navedete fasciklu."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
-msgstr "Morate da date ime ovoj fascikli pretrage."
+msgstr "Morate da date naziv ovoj fascikli pretrage."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "Izvori nisu izabrani."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14705,11 +13939,11 @@ msgstr ""
 "Bilo da pojedinačno izaberete fascikle, i/ili da izaberete sve lokalne "
 "fascikle, sve mrežne fascikle ili i jedne i druge."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem pri prenosu stare fascikle pošte „{0}“."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14721,23 +13955,23 @@ msgstr ""
 "Možete ili da ignorišete ovu fasciklu, da je prepišete ili da dopunite njen "
 "sadržaj, ili da izađete."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "_Prikači"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid "Evolution's local mail format has changed."
 msgstr "Evolucijin lokalni format pošte je promenjen."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -14747,7 +13981,7 @@ msgid ""
 "delete the account after ensuring the data is safely migrated. Please make "
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"Evolucijin lokalni format pošte je promenjen iz mboksa u  Mejldir. Vaša "
+"Evolucijin lokalni format pošte je promenjen iz mboksa u Mejldir. Vaša "
 "lokalna pošta mora biti preseljena u novi format da bi Evolucija mogla da "
 "nastavi sa radom. Da li želite sada da je preselite?\n"
 "\n"
@@ -14755,19 +13989,19 @@ msgstr ""
 "izbrišete nalog nakon uspešnog preseljavanja podataka. Uverite se da ima "
 "dovoljno prostora na disku ukoliko odlučite da ih preselite sada."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
 msgstr "_Izađi iz Evolucije"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "_Migrate Now"
 msgstr "P_reseli sada"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "Ne mogu da pročitam datoteku licence."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -14775,35 +14009,35 @@ msgstr ""
 "Ne mogu da pročitam datoteku licence „{0}“, zbog problema sa instalacijom. "
 "Nećete moći da koristite ovog dostavljača dok ne prihvatite licencu."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "Sačekajte."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Slanje upita serveru za listu podržanih mehanizama potvrđivanja identiteta."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Nisam uspeo da propitam server za spisak podržanih mehanizama potvrđivanja "
 "identiteta."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nisam uspeo da se povežem na GroupVajz server."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:124
 msgid "Please check your account settings and try again."
 msgstr "Proverite podešavanja naloga i pokušajte ponovo."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Uskladiti fascikle lokalno za rad van mreže?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14811,158 +14045,161 @@ msgstr ""
 "Želite li lokalno da uskladite fascikle koje su označene za korišćenje van "
 "mreže?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "_Ne usklađuj"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "_Uskladi"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "Da li želite da sve poruke označite pročitanim?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Ovo označava sve poruke kao pročitane u izabranoj fascikli."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "Ovo označava sve poruke kao pročitane u izabranoj fascikli i podfasciklama."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:132
 msgid "Close message window."
 msgstr "Zatvori prozor poruke."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Would you like to close the message window?"
 msgstr "Da li želite da zatvorite prozor sa porukom?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
 msgid "_No"
 msgstr "_Ne"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:136
 msgid "_Always"
 msgstr "_Uvek"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:137
 msgid "N_ever"
 msgstr "_Nikada"
 
-#: ../mail/mail.error.xml.h:141
-msgid "Signature Already Exists"
-msgstr "Potpis već postoji"
+#: ../mail/mail.error.xml.h:138
+msgid "Copy folder in folder tree."
+msgstr "Umnožite fasciklu u stablo fascikli."
 
-# mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:142
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr "Potpis sa nazivom „{0}“ već postoji. Navedite neko drugo ime."
+#: ../mail/mail.error.xml.h:139
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr ""
+"Da li ste sigurni da želite da umnožite fasciklu „{0}“ u fasciklu „{1}“?"
 
-#: ../mail/mail.error.xml.h:143
-msgid "Blank Signature"
-msgstr "Prazan potpis"
+#: ../mail/mail.error.xml.h:140
+msgid "Move folder in folder tree."
+msgstr "Premestite fasciklu u stablo fascikli."
 
-#: ../mail/mail.error.xml.h:144
-msgid "Please provide an unique name to identify this signature."
-msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
+#: ../mail/mail.error.xml.h:141
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr ""
+"Da li ste sigurni da želite da premestite fasciklu „{0}“ u fasciklu „{1}“?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ova poruka se ne može poslati pošto je isključen nalog sa kojeg šaljete"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:143
 msgid "Please enable the account or send using another account."
 msgstr "Omogućite nalog ili pošaljite koristeći drugi nalog."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:144
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemate dovoljna ovlašćenja da obrišete ovu poštu."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:146
 msgid "\"Check Junk\" Failed"
 msgstr "Provera đubreta nije uspela"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:147
 msgid "\"Report Junk\" Failed"
 msgstr "Izveštaj za đubre nije uspeo"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:148
 msgid "\"Report Not Junk\" Failed"
 msgstr "Izveštavanje da nije đubre nije uspelo"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:149
 msgid "Remove duplicate messages?"
 msgstr "Da uklonim duplirane poruke?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:150
 msgid "No duplicate messages found."
 msgstr "Nisu pronađene duple poruke."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:152
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Fascikla „{0}“ ne sadrži nikakve duple poruke."
 
-#: ../mail/mail.error.xml.h:156
-msgid "Failed to unsubscribe from folder."
-msgstr "Nisam uspeo da se odjavim sa fascikle."
+#: ../mail/mail.error.xml.h:153
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr "Nisam uspeo da prekinem vezu sa nalogom „{0}“."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:155
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "Nisam uspeo da se odjavim sa fascikle „{0}“."
+
+#: ../mail/mail.error.xml.h:156
 msgid "Unable to retrieve message."
 msgstr "Ne mogu da dovučem poruku."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:157
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to open folder."
 msgstr "Nisam uspeo da otvorim fasciklu."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to find duplicate messages."
 msgstr "Nisam uspeo da pronađem duplirane poruke."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to retrieve messages."
 msgstr "Nisam uspeo da dovučem poruke"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to remove attachments from messages."
 msgstr "Nisam uspeo da uklonim priloge iz poruka."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to download messages for offline viewing."
 msgstr "Nisam uspeo da preuzmem poruke za pregledanje van mreže."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to save messages to disk."
 msgstr "Nisam uspeo da sačuvam poruke na disk."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:164
 msgid "Hidden file is attached."
 msgstr "Skrivena datoteka je priložena."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:165
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -14970,74 +14207,52 @@ msgstr ""
 "Prilog pod nazivom {0} je skrivena datoteka i može da sadrži osetljive "
 "podatke. Pregledajte je pre nego li je pošaljete."
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail.error.xml.h:166
+msgid "Printing failed."
+msgstr "Štampanje nije uspelo."
+
+#: ../mail/mail.error.xml.h:167
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "Štampač je odgovorio „{0}“."
+
+#: ../mail/mail.error.xml.h:168
+msgid "Could not perform this operation on {0}."
+msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
+
+#: ../mail/mail-send-recv.c:203
 msgid "Canceling..."
 msgstr "Otkazujem..."
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:537
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:553
 msgid "Cancel _All"
 msgstr "Otkaži _sve"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:1030
 msgid "Updating..."
-msgstr "Ažuriram..."
+msgstr "Osvežavam..."
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:727
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1010
 #, c-format
 msgid "Checking for new mail"
-msgstr "Provera za novim porukama"
-
-#: ../mail/mail-vfolder.c:82
-#, c-format
-msgid "Setting up Search Folder: %s"
-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“"
+msgstr "Vršim proveru za novom poštom"
 
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:562
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-"Fascikla pretrage „%s“ je izmenjena u nalogu za obrisanu fasciklu\n"
-"„%s“."
-msgstr[1] ""
-"Fascikle pretrage „%s“ su izmenjene u nalogu za obrisanu fasciklu\n"
-"„%s“."
-msgstr[2] ""
-"Fascikle pretrage „%s“ su izmenjene u nalogu za obrisanu fasciklu\n"
-"„%s“."
-msgstr[3] ""
-"Fascikla pretrage „%s“ je izmenjena u nalogu za obrisanu fasciklu\n"
-"„%s“."
+#: ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "Fascikle pretrage"
 
-#: ../mail/mail-vfolder.c:1195
+#: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1306
+#: ../mail/mail-vfolder-ui.c:280
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
@@ -15087,7 +14302,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1916 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "Danas u %l:%M %p"
 
@@ -15107,33 +14322,37 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2777
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Poruke"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4140
 msgid "Follow-up"
 msgstr "Sledi"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4638 ../mail/message-list.c:5058
+#: ../mail/message-list.c:4699 ../mail/message-list.c:5119
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4875
+#: ../mail/message-list.c:4933
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"No message satisfies your search criteria. Change search criteria by "
+"selecting a new Show message filter from the drop down list above or by "
+"running a new search either by clearing it with Search->Clear menu item or "
+"by changing the query above."
 msgstr ""
-"Nema poruke sa zadatim uslovima pretrage. Možete očistiti pretragu iz menija "
-"„Pretraga->Očisti“ ili je izmeniti."
+"Nijedna poruka ne zadovoljava vaše uslove pretrage. Izmenite uslov pretrage "
+"birajući novi propusnik za prikazivanje poruka iz padajućeg spiska ili "
+"pokrenite novu pretragu bilo čišćenjem iste pomoću stavke izbornika "
+"„Pretraga—>Očisti“ ili izmenivši gornji upit."
 
-#: ../mail/message-list.c:4877
+#: ../mail/message-list.c:4938
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -15145,11 +14364,6 @@ msgstr "Označeno"
 msgid "Received"
 msgstr "Primljeno"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "Veličina"
-
 #: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Status oznake"
@@ -15175,503 +14389,383 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrže"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Body contains"
 msgstr "Telo sadrži"
 
-#: ../modules/addressbook/addressbook-config.c:204
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Odabir ove mogućnosti znači da će se Evolucija povezati na LDAP server samo "
-"ako on podržava SSL šifrovanje."
-
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Odabir ove mogućnosti znači da će se Evolucija povezati na LDAP server samo "
-"ako on podržava TLS šifrovanje."
-
-#: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Odabir ove mogućnosti znači da server ne podržava ni SSL ni TLS šifrovanje. "
-"To znači da vaša veza neće biti sigurna i da ćete biti ranjivi na sigurnosne "
-"napade. "
-
-#: ../modules/addressbook/addressbook-config.c:649
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "Koristi u kalendaru _Rođendani i godišnjice"
-
-#: ../modules/addressbook/addressbook-config.c:693
-msgid "Copy _book content locally for offline operation"
-msgstr "Umnoži sadržaj _knjige lokalno za rad van mreže"
-
-#: ../modules/addressbook/addressbook-config.c:812
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Ovo je port LDAP servera na koji će Evolucija pokušati da se poveže. Ponuđen "
-"je spisak standardnih portova. Pitajte administratora sistema koji port da "
-"navedete."
-
-#: ../modules/addressbook/addressbook-config.c:898
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Evolucija će koristiti ovaj metod za potvrđivanje identiteta.  Znajte da će "
-"ovo ako postavite na „Elektronska adresa“ zahtevati anonimni pristup na LDAP "
-"server."
-
-#: ../modules/addressbook/addressbook-config.c:987
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo "
-"direktorijuma. Obim pretrage „pod“ će uključiti sve unose ispod baze za "
-"pretragu. Obim pretrage „jedan“ će uključiti samo unose jedan nivo ispod vaše "
-"baze."
-
-#: ../modules/addressbook/addressbook-config.c:1120
-msgid "Server Information"
-msgstr "Podaci servera"
-
-#: ../modules/addressbook/addressbook-config.c:1125
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Detalji"
-
-#: ../modules/addressbook/addressbook-config.c:1126
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "Pretraživanje"
-
-#: ../modules/addressbook/addressbook-config.c:1128
-msgid "Downloading"
-msgstr "Preuzimanje"
-
-#: ../modules/addressbook/addressbook-config.c:1346
-msgid "Address Book Properties"
-msgstr "Postavke adresara"
-
-#: ../modules/addressbook/addressbook-config.c:1348
-msgid "New Address Book"
-msgstr "Novi adresar"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "HML lista e-fascikle liste adresa za dopunjavanje"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "HML lista e-fascikle za listu adresa za dopunjavanje."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr ""
-"JIB izabranog (ili „primarnog“) adresara u bočnoj površi u pregledu "
-"„Kontakti“."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show maps in preview pane."
-msgstr "Da li da prikaže mape u površi za pregled."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
-msgstr ""
-"Da li će adrese biti oblikovane prema standardu u državama njihovog odredišta."
-
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1067
+#: ../modules/addressbook/autocompletion-config.c:96
+#: ../modules/mail/em-mailer-prefs.c:1069
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
-#: ../modules/addressbook/autocompletion-config.c:197
+#: ../modules/addressbook/autocompletion-config.c:99
 msgid "Address formatting"
 msgstr "Oblikovanje adrese"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:102
 msgid "_Format address according to standard of its destination country"
 msgstr "_Oblikuj adresu prema standardu države njenog odredišta"
 
-#: ../modules/addressbook/autocompletion-config.c:209
+#: ../modules/addressbook/autocompletion-config.c:111
 msgid "Autocompletion"
-msgstr "Samodopunjavanje"
+msgstr "Samodovršavanje"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:114
 msgid "Always _show address of the autocompleted contact"
 msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:148
 msgid "Multiple vCards"
 msgstr "Višestruke vKarte"
 
-#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:156
 #, c-format
 msgid "vCard for %s"
 msgstr "vKarta za %s"
 
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
 #, c-format
 msgid "Contact information"
-msgstr "Kontakt"
+msgstr "Podaci za stupanje u vezu"
 
-#: ../modules/addressbook/eab-composer-util.c:198
+#: ../modules/addressbook/eab-composer-util.c:197
 #, c-format
 msgid "Contact information for %s"
 msgstr "Podaci o kontaktu za %s"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:108
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "Na LDAP serverima"
+#: ../modules/addressbook/e-book-shell-backend.c:229
+#: ../modules/addressbook/e-book-shell-view-actions.c:119
+msgid "New Address Book"
+msgstr "Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-backend.c:240
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
 msgid "Create a new contact"
 msgstr "Napravite novi kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:245
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Li_sta kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:318
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-backend.c:247
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
 msgid "Create a new contact list"
-msgstr "Napravite novu listu kontakta"
+msgstr "Napravite novi spisak kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:255
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:328
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-backend.c:257
+#: ../modules/addressbook/e-book-shell-view-actions.c:822
 msgid "Create a new address book"
 msgstr "Napravite novi adresar"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:345
-#: ../modules/addressbook/e-book-shell-view.c:402
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../modules/addressbook/e-book-shell-backend.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgid "Certificates"
 msgstr "Uverenja"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:192
+msgid "Address Book Properties"
+msgstr "Postavke adresara"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:391
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:374
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
 msgid "Save as vCard"
 msgstr "Sačuvajte kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
 msgid "Co_py All Contacts To..."
 msgstr "Umnoži _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Umnožite kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:806
 msgid "D_elete Address Book"
 msgstr "O_briši adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
 msgid "Delete the selected address book"
 msgstr "Obrišite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:813
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:815
 msgid "Move the contacts of the selected address book to another"
 msgstr "Premestite kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:837
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:827
 msgid "Address _Book Properties"
 msgstr "Podešavanja adresa_ra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:829
 msgid "Show properties of the selected address book"
 msgstr "Prikažite svojstva izabranog adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:834
 msgid "Address Book _Map"
 msgstr "_Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../modules/addressbook/e-book-shell-view-actions.c:836
 msgid "Show map with all contacts from selected address book"
-msgstr "Prikazuje mapu sa svim kontaktima iz izabranih adresara"
+msgstr "Prikažite mapu sa svim kontaktima iz izabranih adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../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:1271
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:843
 msgid "Rename the selected address book"
 msgstr "Preimenujte izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:850
 msgid "Stop loading"
 msgstr "Prekini učitavanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:855
 msgid "_Copy Contact To..."
 msgstr "_Umnoži kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:857
 msgid "Copy selected contacts to another address book"
 msgstr "Umnožite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "_Find in Contact..."
 msgstr "_Pronađi u kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:871
 msgid "Search for text in the displayed contact"
 msgstr "Pretražite tekst u prikazanom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
 msgid "Send selected contacts to another person"
 msgstr "Pošaljite izabrane kontakte drugoj osobi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
 msgid "Move selected contacts to another address book"
 msgstr "Premestite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
 msgid "New Contact _List..."
 msgstr "Nova _lista kontakta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
 msgid "View the current contact"
 msgstr "Pregledajte tekući kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
 msgid "Send a message to the selected contacts"
 msgstr "Pošaljite poruku izabranim kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+#: ../modules/calendar/e-task-shell-view-actions.c:846
 msgid "_Actions"
 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:1429
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:853
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:690
-#: ../modules/calendar/e-task-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "_Properties"
-msgstr "O_sobine"
+msgstr "_Svojstva"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Address Book Map"
 msgstr "Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Show contact preview window"
 msgstr "Prikažite prozor za pregled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Show _Maps"
 msgstr "Prikaži _mape"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Show maps in contact preview window"
 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:1548
+#: ../modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Show contact preview below the contact list"
 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:1555
+#: ../modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Show contact preview alongside the contact list"
 msgstr "Prikažite pregled kontakta pored kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-actions.c:1780
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../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:1631
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Print all shown contacts"
 msgstr "Štampaj sve prikazane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred štampu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1086
 msgid "Print selected contacts"
 msgstr "Štampa izabrane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "S_ave Address Book as vCard"
 msgstr "_Sačuvaj adresar kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Sačuvajte kontakte izabranog adresara kao vKartu"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1126
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "_Save as vCard..."
 msgstr "_Sačuvaj kao vKartu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Save selected contacts as a vCard"
 msgstr "Sačuvaj izabrane kontakte kao VKartu"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:295
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:297
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:328
 msgid "_Send Message to Contacts"
 msgstr "_Pošalji poruku kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:330
 msgid "_Send Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:332
 msgid "_Send Message to Contact"
 msgstr "_Pošalji poruku kontaktu"
 
@@ -15680,12 +14774,14 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
-msgstr "Korišćenje elektronske adrese"
+msgstr "Koristi adresu el. pošte"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
-msgstr "Koristi posebno ime (DN)"
+msgstr "Koristi poseban naziv (DN)"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:8
@@ -15701,6 +14797,12 @@ msgstr "Pod"
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
+#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:112
+msgid "_Port:"
+msgstr "_Port:"
+
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Ser_ver:"
 msgstr "S_erver:"
@@ -15756,6 +14858,7 @@ msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "contacts"
 msgstr "kontakti"
 
@@ -15772,380 +14875,521 @@ msgstr "Ograničenje za _preuzimanje:"
 msgid "B_rowse this book until limit reached"
 msgstr "Pre_gleda ovaj adresar dok se ne dostigne limit"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+msgid "Audio Player"
+msgstr "Zvučni uređaj"
+
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+msgid "Play the attachment in embedded audio player"
+msgstr "Pusti prilog u ugrađenom programu"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+msgid ""
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
+msgstr ""
+"Evoluciju možete povratiti iz datoteke rezervne.\n"
+"\n"
+"To će povratiti sve vaše lične podatke, podešavanja propusnika pošte, itd."
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+msgid "_Restore from a backup file:"
+msgstr "_Vrati iz datoteke rezerve:"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+msgid "Choose a backup file to restore"
+msgstr "Izaberite datoteku rezerve za povraćaj"
+
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+msgid "Restore from Backup"
+msgstr "Vrati iz rezerve"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "Izaberite naziv za datoteku rezerve Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Izaberite naziv datoteke rezerve Evolucije za povraćaj"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "Napravi _rezervu podataka Evolucije..."
+
+#: ../modules/backup-restore/evolution-backup-restore.c:310
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
+
+# shell:noshell-reason title
+#: ../modules/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "_Vrati podatke Evolucije..."
+
+#: ../modules/backup-restore/evolution-backup-restore.c:317
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Vratite podatke i postavke Evolucije iz arhive"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:81
+msgid "Back up Evolution directory"
+msgstr "Direktorijum za rezervu Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "Restore Evolution directory"
+msgstr "Direktorijum za povraćaj Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:85
+msgid "Check Evolution Back up"
+msgstr "Proveri rezervu Evolucije"
+
+# shell:noshell-reason title
+#: ../modules/backup-restore/evolution-backup-tool.c:87
+msgid "Restart Evolution"
+msgstr "Ponovo pokreće Evoluciju"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:89
+msgid "With Graphical User Interface"
+msgstr "Sa grafičkim okruženjem"
+
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:312
+#: ../modules/backup-restore/evolution-backup-tool.c:441
+msgid "Shutting down Evolution"
+msgstr "Gašenje Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+msgid "Backing Evolution accounts and settings"
+msgstr "Izradite rezervnu kopiju naloga i postavke Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:338
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+"Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zadaci, beleške)"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:354
+msgid "Back up complete"
+msgstr "Izrada rezervne kopije je završena"
+
+# shell:noshell-reason title
+#: ../modules/backup-restore/evolution-backup-tool.c:361
+#: ../modules/backup-restore/evolution-backup-tool.c:608
+msgid "Restarting Evolution"
+msgstr "Ponovno pokretanje Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:447
+msgid "Back up current Evolution data"
+msgstr "Napravite rezervu trenutnih podataka Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:455
+msgid "Extracting files from back up"
+msgstr "Izvlačim datoteke iz rezervne kopije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:524
+msgid "Loading Evolution settings"
+msgstr "Učitavam podešavanja Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:578
+msgid "Removing temporary back up files"
+msgstr "Uklanjanje privremenih rezervnih datoteka"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:590
+msgid "Reloading registry service"
+msgstr "Ponovo učitavam uslugu zavođenja"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:815
+msgid "Evolution Back Up"
+msgstr "Rezervni primerak Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:816
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Smeštam rezervni primerak u fasciklu „%s“"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:820
+msgid "Evolution Restore"
+msgstr "Povraćaj Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:821
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "Vraćam iz fascikle „%s“"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:889
+msgid "Backing up Evolution Data"
+msgstr "Izrađuje rezervni primerak podataka Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:890
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Sačekajte dok Evolucija ne napravi rezervni primerak podataka."
+
+# shell:noshell-reason title
+#: ../modules/backup-restore/evolution-backup-tool.c:892
+msgid "Restoring Evolution Data"
+msgstr "Povraćaj podataka Evolucije"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:893
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Sačekajte dok Evolucija ne vrati podatke u prvobitno stanje."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:911
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "Ovo može potrajati, u zavisnosti od količine podataka na nalogu."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "Neispravna datoteka rezervnog primerka Evolucije"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
+msgstr "Izaberite ispravnu datoteku rezerve za povraćaj."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Sigurno želite da zatvorite Evoluciju?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"Da napravite rezervnu kopiju vaših podataka i podešavanja, prvo morate da "
+"zatvorite Evoluciju. Budite sigurni da ste sačuvali nesačuvane podatke pre "
+"nego što nastavite."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Izaberite radnju:"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Sigurno želite da povratite Evoluciju iz izabrane datoteke rezerve?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"Da vratite podatke i podešavanja, prvo morate da zatvorite Evoluciju. Budite "
+"sigurni da ste sačuvali nesačuvane podatke pre nego što nastavite. Ovo će "
+"obrisati sve trenutne podatke Evolucije i podešavanja i vratiti one iz vaše "
+"rezerve."
+
+# shell:noshell-reason title
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Zatvorite i vratite Evoluciju"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Nedovoljna ovlašćenja"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "U izabranu fasciklu se ne može pisati."
+
+#: ../modules/bogofilter/evolution-bogofilter.c:149
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Nisam uspeo da izrodim Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:167
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Nisam uspeo da uputim sadržaj poruke pošte Bogofilteru: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:216
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Ili se Bogofilter urušio ili nije uspeo da analizira poruku pošte"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
+#: ../modules/bogofilter/evolution-bogofilter.c:318
 msgid "Bogofilter Options"
 msgstr "Opcije Bogofiltera"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
+#: ../modules/bogofilter/evolution-bogofilter.c:327
 msgid "Convert message text to _Unicode"
 msgstr "Prebaci tekst poruke u _Unikod"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
+#: ../modules/bogofilter/evolution-bogofilter.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"JIB izabranog (ili „primarnog“) kalendara u bočnoj površi u pregledu "
-"„Kalendar“."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+msgid "Standard LDAP Port"
+msgstr "Standardni LDAP port"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
-"neprevedeno mesto baze vremenske zone Olsen, kao „Amerika/Njujork“."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+msgid "LDAP over SSL (deprecated)"
+msgstr "LDAP ili SSL (prevaziđeno)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+msgid "Microsoft Global Catalog"
+msgstr "Majkrosoftov opšti katalog"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Prikazuje drugu vremensku zonu u Dnevnom pregledu, ukoliko je podešena. "
-"Vrednost je slična onoj koja je korišćena u ključu „timezone“."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr "Spisak nedavno korišćenih drugih vremenskih zona u Dnevnom pregledu."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL"
+msgstr "Majkrosoftov opšti katalog preko SSL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Maximum number of recently used timezones to remember."
-msgstr "Najveći broj nedavno korišćenih vremenskih zona za pamćenje."
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+msgid "Connecting to LDAP"
+msgstr "Povezujem se na LDAP"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"Najveći broj nedavno korišćenih vremenskih zona za pamćenje u spisku "
-"„day_second_zones“."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-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."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Dan kojim počinje nedelja, od nedelje (0) do subote (6)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Sat kojim se završava radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 "
-"do 23."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+msgid "Server Information"
+msgstr "Podaci servera"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+msgid "StartTLS (recommended)"
+msgstr "PočetniTLS (preporučeno)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"Pozicija položene površi, između dela kalendara za datum i spiska zadataka "
-"kada nije postavljen mesečni pregled, u pikselima."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Vertical pane position"
-msgstr "Položaj uspravne površi"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+msgid "Encryption:"
+msgstr "Šifrovanje:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"Pozicija uspravne površi, između pregleda i dela kalendara za datum i spiska "
-"zadataka kada nije postavljen mesečni pregled, u pikselima."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:181
+msgid "Authentication"
+msgstr "Potvrđivanje identiteta"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Pozicija položene površi, između pregleda i dela kalendara za datum i spiska "
-"zadataka u mesečnom pregledu, u pikselima."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+msgid "Anonymous"
+msgstr "Anonimno"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Pozicija uspravne površi, između pregleda i dela kalendara za datum i spiska "
-"zadataka u mesečnom pregledu, u pikselima."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+msgid "Method:"
+msgstr "Način:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
 msgstr ""
-"Položaj uspravne površi, između liste kalendara i navigacije kalendara po "
-"datumu."
+"Ovo je način koji će Evolucija da koristi da vam potvrdi identitet.  Znajte "
+"da će ovo ako postavite na „Koristi adresu el. pošte“ zahtevati anonimni "
+"pristup na vaš LDAP server."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak beleški. "
-"„0“ (klasičan pregled) postavlja pregled ispod spiska beleški. "
-"„1“ (vertikalan pregled) postavlja pregled pored spiska beleški."
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+msgid "Using LDAP"
+msgstr "Koristi LDAP"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "Ukoliko je „tačno“, u glavnom prozoru prikazuje pregled beleški."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:116
+msgid "Searching"
+msgstr "Pretražujem"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Pozicija pregleda zadataka kada je postavljeno horizontalno."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+msgid "Search Base:"
+msgstr "Osnova pretrage:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Pozicija pregleda bečeški kada je postavljeno vertikalno."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+msgid "Find Possible Search Bases"
+msgstr "Nađi moguće baze za pretragu"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-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 "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak zadataka. "
-"„0“ (klasičan pregled) postavlja pregled ispod spiska zadataka. "
-"„1“ (vertikalan pregled) postavlja pregled pored spiska zadataka."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+msgid "One Level"
+msgstr "Jedan nivo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "Ukoliko je „tačno“, u glavnom prozoru prikazuje pregled zadataka."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+msgid "Subtree"
+msgstr "Podstablo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+msgid "Search Scope:"
+msgstr "Obim pretrage:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Da li da sažme vikende u mesečnom pregledu, koji subotu i nedelju stavlja u "
-"prostor radne nedelje."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Whether to display the end time of events in the week and month views."
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
 msgstr ""
-"Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim pregledima."
+"Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo "
+"direktorijuma. Obim pretrage „Podstabla“ će uključiti sve unose ispod baze za "
+"pretragu. Obim pretrage „Jedan nivo“ će uključiti samo unose jedan nivo "
+"ispod vaše baze pretrage."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-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."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+msgid "Search Filter:"
+msgstr "Filter pretrage:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+msgid "Downloading"
+msgstr "Preuzimam"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+msgid "Limit:"
+msgstr "Ograničenje:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Boja za iscrtavanje Markus Bejns linije u traci vremena (podrazumevano je "
-"prazno)."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+msgid "Browse until limit is reached"
+msgstr "Razgledaj sve dok se ne dostigne ograničenje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-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."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:133
+msgid "URL:"
+msgstr "Adresa:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-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“."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "Izbegavaj ako_poklapa (potrebno na Apaču < 2.2.8)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-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“."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP greška: %s"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Da li da sakrije završene zadatke u pregledu zadataka."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
+msgid "Could not parse response"
+msgstr "Ne mogu da obradim odgovor"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“ ili „dani“."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
+msgid "Empty response"
+msgstr "Prazan odgovor"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
-msgid "Number of units for determining when to hide tasks."
-msgstr "Broj jedinica za određivanje kada sakriti zadatke."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+msgid "Unexpected reply from server"
+msgstr "Neočekivan odgovor sa servera"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Boja pozadine zaduženja za danas, u obliku „#rrggbb“."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
+msgid "Could not locate user's calendars"
+msgstr "Ne mogu da pronađem korisnikov kalendar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Boja pozadine neispunjenih zaduženja, u obliku „#rrggbb“."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
+msgid "Path"
+msgstr "Putanja"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Da li da traži potvrdu za brisanje zakazivanja ili zadatka."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+msgid "Choose a Calendar"
+msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Da li da traži potvrdu pri izbacivanjuzakazivanja ili zadatka."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+msgid "Choose a Memo List"
+msgstr "Izaberite spisak beleški"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Whether to set a default reminder for appointments."
-msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+msgid "Choose a Task List"
+msgstr "Izaberite spisak sadataka"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Number of units for determining a default reminder."
-msgstr "Broj jedinica za određivanje podrazumevanog podsetnika."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+msgid "Find Calendars"
+msgstr "Pronađite kalendare"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+msgid "Find Memo Lists"
+msgstr "Pronađite spiskove beleški"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Da li da postavi podsetnik na rođendane i godišnjice."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+msgid "Find Task Lists"
+msgstr "Pronađite spiskove zadataka"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "Broj jedinica za određivanje podsetnika na rođendane ili godišnjice."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
+msgid "Path:"
+msgstr "Putanja:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
-"Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili "
-"„dani“."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+msgid "Email:"
+msgstr "El. pošta:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-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."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
+msgid "Server handles meeting invitations"
+msgstr "Server upravlja pozivima na sastanak"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Scroll Month View by a week"
-msgstr "Mesečni pregled po nedeljama"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+msgid "Choose which address books to use."
+msgstr "Izaberite adresare koji ćete koristiti."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "Da li da prikaže Mesečni pregled po nedeljama, umesto mesecima."
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "Koristi u kalendaru za rođendane i godišnjice"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Time the last reminder ran, in time_t."
-msgstr "Vreme poslednjeg pokretanja podsetnika, u „time_t“."
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+msgid "Default User Calendar"
+msgstr "Osnovni korisnički kalendar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Calendars to run reminders for"
-msgstr "Kalendari za koje se pokreću podsetnici"
+#: ../modules/cal-config-google/e-google-chooser.c:508
+#, c-format
+msgid "Enter Google password for user '%s'."
+msgstr "Unesite Guglovu lozinku za „%s“."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programi koji mogu biti pokrenuti podsetnicima."
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr "Korisnik je odbio da dostavi lozinku"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "Da li da koristi obaveštajnu zonu za prikazivanje podsetnika."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+msgid "Use an existing iCalendar (ics) file"
+msgstr "Koristite postojeću datoteku iKalendara (ics)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Free/busy server URLs"
-msgstr "Adrese servera za slobodno/zauzeto vreme"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+msgid "iCalendar File"
+msgstr "Datoteka iKalendara"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "List of server URLs for free/busy publishing."
-msgstr "Spisak adresa servera za objavljivanje slobodnog/zauzetog vremena."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+msgid "Choose an iCalendar file"
+msgstr "Izaberite datoteku iKalendara"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Model adrese za korišćenje u povraćaju vremena slobodno/zauzeto, %u se "
-"zamenjuje korisničkim delom elektronske adrese, a %d domenom."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+msgid "File:"
+msgstr "Datoteka:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Može imati tri vrednosti. 0 za greške. 1 za upozorenja. 2 za poruke o "
-"dijagnozi kvara."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+msgid "Allow Evolution to update the file"
+msgstr "Dopušta Evoluciji da osveži datoteku"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:397
+#: ../modules/calendar/e-cal-attachment-handler.c:409
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../modules/calendar/e-cal-attachment-handler.c:436
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:446
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:453
 msgid "I_mport to Tasks"
 msgstr "U_vezi u zadatke"
 
-#: ../modules/calendar/e-calendar-preferences.c:467
-msgid "Selected Calendars for Reminders"
-msgstr "Izabrani kalendari za podsetnike"
+#: ../modules/calendar/e-calendar-preferences.c:406
+msgid "Selected Calendars for Alarms"
+msgstr "Izabrani kalendari za alarme"
 
-#: ../modules/calendar/e-calendar-preferences.c:891
+#: ../modules/calendar/e-calendar-preferences.c:828
 msgid "Ti_me and date:"
 msgstr "_Vreme i datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "_Date only:"
 msgstr "Samo _datum:"
 
-# bug: plural-forms
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "Minutes"
-msgstr "Minuti"
+msgstr "Minuta"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Hours"
@@ -16155,27 +15399,22 @@ msgstr "Sati"
 msgid "Days"
 msgstr "Dani"
 
-# bug: plural-forms
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "60 minutes"
 msgstr "60 minuta"
 
-# bug: plural-forms
 #: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "30 minutes"
 msgstr "30 minuta"
 
-# bug: plural-forms
 #: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "15 minutes"
 msgstr "15 minuta"
 
-# bug: plural-forms
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "10 minutes"
 msgstr "10 minuta"
 
-# bug: plural-forms
 #: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "05 minutes"
 msgstr "05 minuta"
@@ -16211,7 +15450,7 @@ msgid "_24 hour"
 msgstr "_24 - časovni"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1742
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -16304,6 +15543,10 @@ msgstr "Pri_kazuje Mesečni pregled po nedeljama"
 msgid "Display"
 msgstr "Prikaz"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "Spisak zadataka"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Highlight t_asks due today"
 msgstr "Istakni _zadatke u toku dana"
@@ -16361,92 +15604,71 @@ msgstr "%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese."
 msgid "Publishing Information"
 msgstr "Podaci o objavljivanju"
 
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:114
-#: ../modules/calendar/e-memo-shell-migrate.c:155
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
-msgstr "Na vebu"
-
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "Vreme"
-
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "Rođendani i godišnjice"
+#: ../modules/calendar/e-cal-shell-backend.c:278
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
+msgid "New Calendar"
+msgstr "Novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:287
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-backend.c:289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-backend.c:294
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:301
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:467
+#: ../modules/calendar/e-cal-shell-backend.c:303
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:475
+#: ../modules/calendar/e-cal-shell-backend.c:311
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:800
+#: ../modules/calendar/e-cal-shell-backend.c:597
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
+#: ../modules/calendar/e-cal-shell-sidebar.c:209
 msgid "Loading calendars"
 msgstr "Učitavanje kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-msgid "_New Calendar..."
-msgstr "Novi _kalendar..."
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:778
+#: ../modules/calendar/e-cal-shell-sidebar.c:715
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1114
+#: ../modules/calendar/e-cal-shell-sidebar.c:1066
 #, c-format
-msgid "Opening calendar at %s"
-msgstr "Otvaram kalendar na %s"
+msgid "Opening calendar '%s'"
+msgstr "Otvaram kalendar „%s“"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-msgid "Print"
-msgstr "Štampaj"
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
+msgid "Calendar Properties"
+msgstr "Osobine kalendara"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:320
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -16457,487 +15679,549 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:337
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:590
 msgid "Copying Items"
 msgstr "Umnožavanje stavki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:884
 msgid "Moving Items"
 msgstr "Premeštanje stavki"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
 msgid "event"
 msgstr "događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:548
+#: ../modules/calendar/e-task-shell-view-actions.c:665
 msgid "Save as iCalendar"
 msgstr "Sačuvaj kao iKalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "D_elete Calendar"
 msgstr "Ob_riši kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Delete the selected calendar"
 msgstr "Obrišite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Select a specific date"
 msgstr "Izaberite određeni datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-task-shell-view-actions.c:837
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Purge old appointments and meetings"
 msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Refresh the selected calendar"
 msgstr "Osvežite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Rename the selected calendar"
 msgstr "Preimenujte izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+msgid "Find _next"
+msgstr "Pronađi _sledeće"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+msgid "Find next occurrence of the current search string"
+msgstr "Pronađite sledeće pojavljivanje tekuće niske pretrage"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+msgid "Find _previous"
+msgstr "Pronađi _prethodno"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+msgid "Find previous occurrence of the current search string"
+msgstr "Pronađite prethodno pojavljivanje tekuće niske pretrage"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "Stop _running search"
+msgstr "Zaustavi _tekuću pretragu"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+msgid "Stop currently running search"
+msgstr "Zaustavite trenutno pokrenutu pretragu"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Show _Only This Calendar"
 msgstr "Prikaži _samo ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Delete Appointment"
 msgstr "_Obriši zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Delete selected appointments"
 msgstr "Obrišite izabrana zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "Delete This _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "Delete this occurrence"
 msgstr "Obrišite ovu pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "Delete All Occ_urrences"
 msgstr "Obriši sve po_jave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Delete all occurrences"
 msgstr "Obrišite sve pojave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _događaj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Create a new all day event"
 msgstr "Napravite novi celodnevni događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "New _Meeting..."
 msgstr "Novi _sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "Create a new meeting"
 msgstr "Napravite novi sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "New _Appointment..."
 msgstr "Novo _zakazivanje..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "View the current appointment"
 msgstr "Pregledajte tekuće zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "_Reply"
-msgstr "O_dgovori"
+msgstr "_Odgovori"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvorite zakazano u sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvorite sastanak u zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "List"
 msgstr "Spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1744
 msgid "Show one work week"
 msgstr "Prikaži jednu radnu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Next 7 Days' Appointments"
 msgstr "Zakazano za sledeću nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1773
 msgid "Occurs Less Than 5 Times"
 msgstr "Dešava se manje od 5 puta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1811
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1830
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred štampu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1852
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
+#: ../modules/calendar/e-memo-shell-view-actions.c:867
+#: ../modules/calendar/e-task-shell-view-actions.c:1066
 msgid "_Save as iCalendar..."
 msgstr "_Sačuvaj kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1929
 msgid "Go To"
 msgstr "Idi na"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:546
 msgid "memo"
 msgstr "beleška"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
 msgid "New _Memo"
 msgstr "Nova _beleška"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:204
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
 msgid "Create a new memo"
 msgstr "Napravite jednu novu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:685
 msgid "_Open Memo"
 msgstr "_Otvori belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
 msgid "View the selected memo"
 msgstr "Pogledajte izabranu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:830
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:852
 msgid "Print the selected memo"
 msgstr "Štampajte izabranu belešku"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:1457
+msgid "Searching next matching event"
+msgstr "Tražim sledeći odgovarajući događaj"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1458
+msgid "Searching previous matching event"
+msgstr "Tražim prethodni odgovarajući događaj"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1476
+#, c-format
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] "Ne mogu da pronađem odgovarajući događaj u sledećoj %d godini"
+msgstr[1] "Ne mogu da pronađem odgovarajući događaj u sledeće %d godine"
+msgstr[2] "Ne mogu da pronađem odgovarajući događaj u sledećih %d godina"
+msgstr[3] "Ne mogu da pronađem odgovarajući događaj u sledećoj %d godini"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1479
+#, c-format
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] "Ne mogu da pronađem odgovarajući događaj u prethodnoj %d godini"
+msgstr[1] "Ne mogu da pronađem odgovarajući događaj u prethodne %d godini"
+msgstr[2] "Ne mogu da pronađem odgovarajući događaj u prethodnih %d godini"
+msgstr[3] "Ne mogu da pronađem odgovarajući događaj u prethodnoj %d godini"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1500
+msgid "Cannot search with no active calendar"
+msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
+
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "task"
 msgstr "zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Mark as Complete"
 msgstr "_Označi kao završeno"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "Mark selected tasks as complete"
 msgstr "Obeležite izabrane zadatke kao završene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "_Označi kao nezavršeno"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:811
 msgid "Mark selected tasks as incomplete"
 msgstr "Obeležite izabrane zadatke kao nezavršene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:305
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:201
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Create a new task"
 msgstr "Napravite novi zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "View the selected task"
 msgstr "Pregledajte izabrani zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1051
 msgid "Print the selected task"
 msgstr "Štampa izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:308
+#: ../modules/calendar/e-memo-shell-backend.c:193
+#: ../modules/calendar/e-memo-shell-view-actions.c:216
+msgid "New Memo List"
+msgstr "Novi spisak beleške"
+
+#: ../modules/calendar/e-memo-shell-backend.c:202
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:209
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleška"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:211
 msgid "Create a new shared memo"
 msgstr "Napravite novu deljenu belešku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:219
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleški"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-backend.c:221
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Create a new memo list"
 msgstr "Sastavite novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:186
+#: ../modules/calendar/e-memo-shell-sidebar.c:204
 msgid "Loading memos"
 msgstr "Učitavam beleške"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:703
+#: ../modules/calendar/e-memo-shell-sidebar.c:647
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleški"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1001
+#: ../modules/calendar/e-memo-shell-sidebar.c:951
 #, c-format
-msgid "Opening memos at %s"
-msgstr "Otvaram belešku sa „%s“"
+msgid "Opening memo list '%s'"
+msgstr "Otvaram spisak beleški „%s“"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:288
+msgid "Memo List Properties"
+msgstr "Osobine spiska zadataka"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Delete Memo"
 msgstr "_Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "_Find in Memo..."
 msgstr "P_ronađi u belešci..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Search for text in the displayed memo"
 msgstr "Pretražite tekst u prikazanoj belešci"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "D_elete Memo List"
 msgstr "Ob_riši spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Delete the selected memo list"
 msgstr "Obrišite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Refresh the selected memo list"
 msgstr "Osvežite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "Rename the selected memo list"
 msgstr "Preimenujte izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Show _Only This Memo List"
 msgstr "Prikaži _samo ovaj spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Memo _Preview"
 msgstr "_Pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview pane"
 msgstr "Prikažite pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Show memo preview below the memo list"
 msgstr "Prikažite pregled beleški ispod spiska beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-memo-shell-view-actions.c:780
 msgid "Show memo preview alongside the memo list"
 msgstr "Prikažite pregled beleški pored spiska beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:838
 msgid "Print the list of memos"
 msgstr "Štampajte spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
 msgid "Preview the list of memos to be printed"
 msgstr "Pregledajte spisak beleški za štampu"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:233
 msgid "Delete Memos"
 msgstr "Obriši beleške"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:235
 msgid "Delete Memo"
 msgstr "Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:427
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -16946,56 +16230,64 @@ msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 msgstr[3] "%d beleška"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-memo-shell-view-private.c:431
+#: ../modules/calendar/e-task-shell-view-private.c:612
 #, c-format
 msgid "%d selected"
 msgstr "izabranih — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:190
+#: ../modules/calendar/e-task-shell-view-actions.c:239
+msgid "New Task List"
+msgstr "Novi spisak zadataka"
+
+#: ../modules/calendar/e-task-shell-backend.c:199
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:310
+#: ../modules/calendar/e-task-shell-backend.c:206
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:312
+#: ../modules/calendar/e-task-shell-backend.c:208
 msgid "Create a new assigned task"
 msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:216
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-backend.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Create a new task list"
 msgstr "Napravite novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:186
+#: ../modules/calendar/e-task-shell-sidebar.c:204
 msgid "Loading tasks"
 msgstr "Učitavam zadatke"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:703
+#: ../modules/calendar/e-task-shell-sidebar.c:647
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1002
+#: ../modules/calendar/e-task-shell-sidebar.c:951
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "Otvaram zadatke u „%s“"
+msgid "Opening task list '%s'"
+msgstr "Otvaram spisak zadataka „%s“"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:311
+msgid "Task List Properties"
+msgstr "Osobine spiska zadataka"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:607
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17007,115 +16299,115 @@ msgstr ""
 "\n"
 "Da obrišem ove zadatke?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:614
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "_Delete Task"
 msgstr "_Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "_Find in Task..."
 msgstr "_Pronađi u zadatku..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Search for text in the displayed task"
 msgstr "Pretraži tekst u prikazanom zadatku"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Copy..."
 msgstr "Umnoži..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "D_elete Task List"
 msgstr "O_briši spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Delete the selected task list"
 msgstr "Obrišite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Refresh the selected task list"
 msgstr "Osvežite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Rename the selected task list"
 msgstr "Preimenujte izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Show _Only This Task List"
 msgstr "Prikaži _samo ovaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Mar_k as Incomplete"
 msgstr "O_znači kao nezavršeno"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:839
 msgid "Delete completed tasks"
 msgstr "Obrišite završene zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview pane"
 msgstr "Prikažite pregled zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Show task preview below the task list"
 msgstr "Prikažite pregled ispod spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Show task preview alongside the task list"
 msgstr "Prikažite pregled pored spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Completed Tasks"
 msgstr "Završeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Next 7 Days' Tasks"
 msgstr "Zadaci za sledeću nedelju"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Overdue Tasks"
 msgstr "Prekoračeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1037
 msgid "Print the list of tasks"
 msgstr "Štampajte spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "Preview the list of tasks to be printed"
 msgstr "Pregledajte spisak zadataka pred štampu"
 
-#: ../modules/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:368
 msgid "Delete Tasks"
 msgstr "Obriši zadatke"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:370
 msgid "Delete Task"
 msgstr "Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-private.c:498
+#: ../modules/calendar/e-task-shell-view-private.c:501
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: ../modules/calendar/e-task-shell-view-private.c:605
+#: ../modules/calendar/e-task-shell-view-private.c:608
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17124,7 +16416,880 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../modules/mail/e-mail-attachment-handler.c:389
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
+msgid "IMAP Headers"
+msgstr "IMAP zaglavlja"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
+msgid ""
+"Select a predefined set of IMAP headers to fetch.\n"
+"Note, larger sets of headers take longer to download."
+msgstr ""
+"Izaberite unapred određeni skup IMAP zaglavlja za dovlačenje.\n"
+"Znajte, da većim skupovima zaglavlja je potrebno više vremena za preuzimanje."
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
+msgid "_Fetch All Headers"
+msgstr "_Pribavi sva zaglavlja"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
+msgid "_Basic Headers (fastest)"
+msgstr "_Osnovna zaglavlja (najbrže)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
+msgid "Use this if you are not filtering any mailing lists."
+msgstr "Koristite ovo ukoliko nemate filtere na dopisnim listama."
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
+msgid "Basic and _Mailing List Headers (default)"
+msgstr "Osnovna i zaglavlja _dopisnih listi (osnovno)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
+msgid "Custom Headers"
+msgstr "Prilagođena zaglavlja"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
+msgid ""
+"Specify any extra headers to fetch in addition to the predefined set of "
+"headers selected above."
+msgstr ""
+"Navedite bilo koje dodatno zaglavlje za dovlačenje kao dodatak unapred "
+"određenom skupu zaglavlja gore izabranih."
+
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:135
+msgid "ITIP"
+msgstr "ITIP"
+
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:141
+msgid "Display part as an invitation"
+msgstr "Prikazuje delove kao pozivnicu"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:240
+msgid "Today %H:%M"
+msgstr "Danas u %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:244
+msgid "Today %H:%M:%S"
+msgstr "Danas u %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:253
+msgid "Today %l:%M:%S %p"
+msgstr "Danas u %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:268
+msgid "Tomorrow %H:%M"
+msgstr "Sutra u %H:%M"
+
+# strftime format of a time in 24-hour format.
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:272
+msgid "Tomorrow %H:%M:%S"
+msgstr "Sutra u %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:277
+msgid "Tomorrow %l:%M %p"
+msgstr "Sutra u %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Sutra u %l:%M %S %p"
+
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:300
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+# strftime format of a time in 24-hour format,
+# without seconds.
+# This is a strftime() format. %H = hour (0-23), %M = minute.
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:305
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+# strftime format of a time in 24-hour format.
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:309
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:314
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+# strftime format of a time in 12-hour format.
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:318
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:327
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:333
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:337
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:342
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %B %e %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:346
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:352
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y."
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:357
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y. %H:%M"
+
+# strptime format of a weekday, a date and a time,
+# in 24-hour format.
+# strftime format of a weekday, a date and a
+# time, in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:361
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y. %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:366
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y. %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:370
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y. %l:%M:%S %p"
+
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:409
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:499
+#: ../modules/itip-formatter/itip-view.c:588
+msgid "An unknown person"
+msgstr "Nepoznata osoba"
+
+#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:592
+#, c-format
+msgid "Please respond on behalf of %s"
+msgstr "Odgovorite u ime %s"
+
+#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:594
+#, c-format
+msgid "Received on behalf of %s"
+msgstr "Primljeno u ime %s"
+
+#: ../modules/itip-formatter/itip-view.c:420
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s preko %s objavljuje sledeći podatak o sastanku:"
+
+#: ../modules/itip-formatter/itip-view.c:422
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "%s objavljuje sledeći podatak o sastanku:"
+
+#: ../modules/itip-formatter/itip-view.c:427
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s vam delegira sledeći sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:430
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s preko %s zahteva vaše prisustvo na sledećem sastanku:"
+
+#: ../modules/itip-formatter/itip-view.c:432
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s zahteva vaše prisustvo na sledećem sastanku:"
+
+#: ../modules/itip-formatter/itip-view.c:438
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s preko %s želi da doda postojećem sastanku:"
+
+#: ../modules/itip-formatter/itip-view.c:440
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s želi da doda postojećem sastanku:"
+
+#: ../modules/itip-formatter/itip-view.c:444
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s preko %s želi da primi najnovije informacije za sledeći sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:446
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s želi da primi najnoviji podatak za sledeći sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:450
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s preko %s šalje sledeći odgovor za sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:452
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "%s šalje sledeći odgovor za sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:456
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s preko %s otkazuje sledeći sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:458
+#, c-format
+msgid "%s has canceled the following meeting:"
+msgstr "%s otkazuje sledeći sastanak:"
+
+#: ../modules/itip-formatter/itip-view.c:462
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s preko %s predlaže sledeće promene sastanka."
+
+#: ../modules/itip-formatter/itip-view.c:464
+#, c-format
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s predlaže sledeće izmene sastanka:"
+
+#: ../modules/itip-formatter/itip-view.c:468
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s preko %s odbija sledeće promene sastanka:"
+
+#: ../modules/itip-formatter/itip-view.c:470
+#, c-format
+msgid "%s has declined the following meeting changes:"
+msgstr "%s odbija sledeće izmene sastanka:"
+
+#: ../modules/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr "%s preko %s objavljuje sledeći zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has published the following task:"
+msgstr "%s objavi sledeće zaduženje:"
+
+#: ../modules/itip-formatter/itip-view.c:517
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s zahteva da %s preuzme sledeći zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:520
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "%s preko %s vam dodeljuje zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:522
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "%s vam dodeljuje zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:528
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s preko %s želi da doda postojećem zadatku:"
+
+#: ../modules/itip-formatter/itip-view.c:530
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "%s želi da doda postojećem zadatku:"
+
+#: ../modules/itip-formatter/itip-view.c:534
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s preko %s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:536
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:540
+#, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s preko %s vraća sledeći odgovor na dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:542
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s šalje nazad sledeći odgovor na dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:546
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s preko %s otkazuje sledeći dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:548
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "%s otkazuje sledeći dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:552
+#, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s preko %s predlaže sledeće promene u dodeli zadatka:"
+
+#: ../modules/itip-formatter/itip-view.c:554
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s predlaže sledeće promene u dodeli zadatka:"
+
+#: ../modules/itip-formatter/itip-view.c:558
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s preko %s odbija sledeći dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:560
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s odbija sledeći dodeljeni zadatak:"
+
+#: ../modules/itip-formatter/itip-view.c:599
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s preko %s objavljuje sledeću belešku:"
+
+#: ../modules/itip-formatter/itip-view.c:601
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s objavljuje sledeću belešku:"
+
+#: ../modules/itip-formatter/itip-view.c:606
+#, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s preko %s želi da doda postojećoj belešci:"
+
+#: ../modules/itip-formatter/itip-view.c:608
+#, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s želi da doda postojećoj belešci:"
+
+#: ../modules/itip-formatter/itip-view.c:612
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s preko %s otkazuje sledeću deljenu belešku:"
+
+#: ../modules/itip-formatter/itip-view.c:614
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s otkazuje sledeće deljenu belešku:"
+
+#: ../modules/itip-formatter/itip-view.c:687
+msgid "All day:"
+msgstr "Celodnevno:"
+
+#: ../modules/itip-formatter/itip-view.c:693
+msgid "Start day:"
+msgstr "Početak dana:"
+
+#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:1450
+msgid "Start time:"
+msgstr "Vreme početka:"
+
+#: ../modules/itip-formatter/itip-view.c:702
+msgid "End day:"
+msgstr "Kraj dana:"
+
+#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:1451
+msgid "End time:"
+msgstr "Vreme završetka:"
+
+#: ../modules/itip-formatter/itip-view.c:1008
+msgid "_Open Calendar"
+msgstr "O_tvori kalendar"
+
+#: ../modules/itip-formatter/itip-view.c:1011
+msgid "_Decline all"
+msgstr "Od_bij sve"
+
+#: ../modules/itip-formatter/itip-view.c:1014
+msgid "_Decline"
+msgstr "_Odbij"
+
+#: ../modules/itip-formatter/itip-view.c:1017
+msgid "_Tentative all"
+msgstr "Sve sa re_zervom"
+
+#: ../modules/itip-formatter/itip-view.c:1020
+msgid "_Tentative"
+msgstr "Sa _rezervom"
+
+#: ../modules/itip-formatter/itip-view.c:1023
+msgid "A_ccept all"
+msgstr "P_rihvati sve"
+
+#: ../modules/itip-formatter/itip-view.c:1026
+msgid "A_ccept"
+msgstr "_Prihvati"
+
+#: ../modules/itip-formatter/itip-view.c:1029
+msgid "_Send Information"
+msgstr "Pošalji podat_ke"
+
+#: ../modules/itip-formatter/itip-view.c:1032
+msgid "_Update Attendee Status"
+msgstr "Ažuriraj stanje učesni_ka"
+
+#: ../modules/itip-formatter/itip-view.c:1035
+msgid "_Update"
+msgstr "_Osveži"
+
+#: ../modules/itip-formatter/itip-view.c:1453
+#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:1561
+msgid "Comment:"
+msgstr "Napomena:"
+
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1484
+msgid "Send reply to sender"
+msgstr "Odgovori pošiljaocu"
+
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1498
+msgid "Send _updates to attendees"
+msgstr "Pošalji _ažurirane podatke učesnicima"
+
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1501
+msgid "_Apply to all instances"
+msgstr "Pri_meni na sve nivoe"
+
+#: ../modules/itip-formatter/itip-view.c:1502
+msgid "Show time as _free"
+msgstr "Prikaži vreme kao _slobodno"
+
+#: ../modules/itip-formatter/itip-view.c:1503
+msgid "_Preserve my reminder"
+msgstr "_Očuvaj moj podsetnik"
+
+#: ../modules/itip-formatter/itip-view.c:1504
+msgid "_Inherit reminder"
+msgstr "_Nasledi podsetnik"
+
+#: ../modules/itip-formatter/itip-view.c:1825
+msgid "_Tasks:"
+msgstr "_Zadaci:"
+
+#: ../modules/itip-formatter/itip-view.c:1828
+msgid "_Memos:"
+msgstr "_Beleške:"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * the second '%s' with an error message
+#: ../modules/itip-formatter/itip-view.c:3472
+#, c-format
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Ne mogu da učitam kalendara „%s“ (%s)"
+
+#: ../modules/itip-formatter/itip-view.c:3629
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Jedno zakazivanje u kalendaru „%s“ je u isto vreme kad i ovaj sastanak"
+
+#: ../modules/itip-formatter/itip-view.c:3653
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
+
+#: ../modules/itip-formatter/itip-view.c:3748
+msgid "Unable to find any calendars"
+msgstr "Ne mogu da pronađem nijedan kalendar"
+
+#: ../modules/itip-formatter/itip-view.c:3756
+msgid "Unable to find this meeting in any calendar"
+msgstr "Ne mogu da pronađem ovaj sastanak ni u jednom kalendaru"
+
+#: ../modules/itip-formatter/itip-view.c:3761
+msgid "Unable to find this task in any task list"
+msgstr "Ne mogu da pronađem ovaj zadatak ni u jednom spisku zadataka"
+
+#: ../modules/itip-formatter/itip-view.c:3766
+msgid "Unable to find this memo in any memo list"
+msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
+
+#: ../modules/itip-formatter/itip-view.c:4106
+msgid "Opening the calendar. Please wait..."
+msgstr "Otvaram kalendar. Molim sačekajte..."
+
+#: ../modules/itip-formatter/itip-view.c:4111
+msgid "Searching for an existing version of this appointment"
+msgstr "Pretraga za jednom postojećom verzijom ovog zakazivanja je u toku"
+
+#: ../modules/itip-formatter/itip-view.c:4493
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Ne mogu da pošaljem stavke kalendaru „%s“.  %s"
+
+#: ../modules/itip-formatter/itip-view.c:4508
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
+
+#: ../modules/itip-formatter/itip-view.c:4513
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Poslato kalendaru „%s“ kao pokušaj"
+
+#: ../modules/itip-formatter/itip-view.c:4519
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Poslato kalendaru „%s“ kao odbijeno"
+
+#: ../modules/itip-formatter/itip-view.c:4525
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Poslato kalendaru „%s“ kao otkazano"
+
+#: ../modules/itip-formatter/itip-view.c:4595
+#: ../modules/itip-formatter/itip-view.c:5029
+#: ../modules/itip-formatter/itip-view.c:5136
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
+
+#: ../modules/itip-formatter/itip-view.c:4634
+msgid "Unable to parse item"
+msgstr "Ne mogu da obradim stavku"
+
+#: ../modules/itip-formatter/itip-view.c:4823
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "Organizator je uklonio delegata „%s“ "
+
+#: ../modules/itip-formatter/itip-view.c:4838
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Delegatu je poslato obaveštenje o otkazivanju"
+
+#: ../modules/itip-formatter/itip-view.c:4842
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Ne mogu delegatu da pošaljem obaveštenje o otkazivanju"
+
+#: ../modules/itip-formatter/itip-view.c:4891
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Ne mogu da ažuriram učesnika. %s"
+
+#: ../modules/itip-formatter/itip-view.c:4898
+msgid "Attendee status updated"
+msgstr "Status učesnika je ažuriran"
+
+#: ../modules/itip-formatter/itip-view.c:4921
+msgid "The meeting is invalid and cannot be updated"
+msgstr "Sastanak nije ispravan i ne može biti ažuriran"
+
+#: ../modules/itip-formatter/itip-view.c:4994
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "Status učesnika nije ažuriran zbog neispravnog stanja"
+
+#: ../modules/itip-formatter/itip-view.c:5066
+#: ../modules/itip-formatter/itip-view.c:5106
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Status učesnika nije osvežen jer stavka više ne postoji"
+
+#: ../modules/itip-formatter/itip-view.c:5169
+msgid "Meeting information sent"
+msgstr "Podatak o sastanku je poslat"
+
+#: ../modules/itip-formatter/itip-view.c:5174
+msgid "Task information sent"
+msgstr "Podatak o zadatku je poslat"
+
+#: ../modules/itip-formatter/itip-view.c:5179
+msgid "Memo information sent"
+msgstr "Podatak o belešci je poslat"
+
+#: ../modules/itip-formatter/itip-view.c:5190
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "Ne mogu da pošaljem podatak o sastanku, sastanak ne postoji"
+
+#: ../modules/itip-formatter/itip-view.c:5195
+msgid "Unable to send task information, the task does not exist"
+msgstr "Ne mogu da pošaljem podatak o zadatku, zaduženje ne postoji"
+
+#: ../modules/itip-formatter/itip-view.c:5200
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "Ne mogu da pošaljem podatak o belešci, beleška ne postoji"
+
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5265
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../modules/itip-formatter/itip-view.c:5270
+msgid "Save Calendar"
+msgstr "Sačuvaj kalendar"
+
+#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5334
+msgid "The calendar attached is not valid"
+msgstr "Priložen kalendar nije ispravan"
+
+#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5335
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+"Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
+"iKalendar."
+
+#: ../modules/itip-formatter/itip-view.c:5376
+#: ../modules/itip-formatter/itip-view.c:5405
+#: ../modules/itip-formatter/itip-view.c:5503
+msgid "The item in the calendar is not valid"
+msgstr "Stavka u kalendaru nije ispravna"
+
+#: ../modules/itip-formatter/itip-view.c:5377
+#: ../modules/itip-formatter/itip-view.c:5406
+#: ../modules/itip-formatter/itip-view.c:5504
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
+"slobodno/zauzeto."
+
+#: ../modules/itip-formatter/itip-view.c:5420
+msgid "The calendar attached contains multiple items"
+msgstr "Kalendar u prilogu sadrži više stavki"
+
+#: ../modules/itip-formatter/itip-view.c:5421
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Radi obrade svih ovih stavki, potrebno je datoteku sačuvati a kalendar uvesti"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#: ../modules/itip-formatter/itip-view.c:5947
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Ništa"
+
+#: ../modules/itip-formatter/itip-view.c:5963
+msgid "Tentatively Accepted"
+msgstr "Prihvaćeno s rezervom"
+
+#: ../modules/itip-formatter/itip-view.c:6106
+msgid "This meeting recurs"
+msgstr "Ovaj sastanak se ponavlja"
+
+#: ../modules/itip-formatter/itip-view.c:6109
+msgid "This task recurs"
+msgstr "Ovaj zadatak se ponavlja"
+
+#: ../modules/itip-formatter/itip-view.c:6112
+msgid "This memo recurs"
+msgstr "Ova beleška se ponavlja"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Ovaj odgovor nije poslao prisutan učesnik. Dodati ga u prisutne?"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "Ovaj sastanak je delegiran"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "„{0}“ delegira sastanak. Želite li da dodate delegata „{1}“?"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:82
+msgid "Meeting Invitations"
+msgstr "Pozivnice za sastanak"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:108
+msgid "_Delete message after acting"
+msgstr "_Obriši poruku nakon radnje"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
+msgid "Conflict Search"
+msgstr "Pretraga preklapanja"
+
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:137
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Bira kalendare za pretragu preklapanja u sastancima"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Itip Formatter"
+msgstr "Itip formatiranje"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Prikazuje MIME delove „text/calendar“ u porukama."
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+msgid "Google Features"
+msgstr "Gugl mogućnosti"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
+msgid "Add Google Ca_lendar to this account"
+msgstr "Dodaj ka_lendar Gugla ovom nalogu"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:269
+msgid "Add Google Con_tacts to this account"
+msgstr "Dodaj ko_ntakte Gugla ovom nalogu"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
+msgid "You may need to enable IMAP access"
+msgstr "Možda ćete morati da omogućite IMAP pristup"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+msgid "Mail _Directory:"
+msgstr "Direktorijum _pošte:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+msgid "Choose a MH mail directory"
+msgstr "Izaberite MH direktorijum pošte"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "Mesna datoteka _dostave:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "Choose a local delivery file"
+msgstr "Izaberite mesnu datoteku dostave"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+msgid "Choose a Maildir mail directory"
+msgstr "Izaberite Mejldir direktorijum pošte"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+msgid "Spool _File:"
+msgstr "Datoteka _pripreme:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+msgid "Choose a mbox spool file"
+msgstr "Izaberite datoteku mboks pripreme"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Spool _Directory:"
+msgstr "Direktorijum _pripreme:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+msgid "Choose a mbox spool directory"
+msgstr "Izaberite direktorijum mboks pripreme"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:81
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "Podešavanje"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:99
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:228
+msgid "User_name:"
+msgstr "Korisničko_ime:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
+msgid "Encryption _method:"
+msgstr "Način _šifrovanja:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
+msgid "STARTTLS after connecting"
+msgstr "STARTTLS nakon povezivanja"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
+msgid "SSL on a dedicated port"
+msgstr "SSL na odeđenom portu"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+msgid "Ser_ver requires authentication"
+msgstr "Ser_ver traži potvrđivanje identiteta"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:210
+msgid "T_ype:"
+msgstr "_Vrsta:"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+msgid "Yahoo! Features"
+msgstr "Jahu! mogućnosti"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "Dodaj Jahu! _kalendar i zadatke ovom nalogu"
+
+#: ../modules/mail/e-mail-attachment-handler.c:390
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -17133,168 +17298,160 @@ 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:230
+#: ../modules/mail/e-mail-shell-backend.c:248
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:232
+#: ../modules/mail/e-mail-shell-backend.c:250
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:258
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštanski _nalog"
 
-#: ../modules/mail/e-mail-shell-backend.c:242
+#: ../modules/mail/e-mail-shell-backend.c:260
 msgid "Create a new mail account"
 msgstr "Napravite novi nalog za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:247
+#: ../modules/mail/e-mail-shell-backend.c:265
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:249
+#: ../modules/mail/e-mail-shell-backend.c:267
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:464
+#: ../modules/mail/e-mail-shell-backend.c:563
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:473
+#: ../modules/mail/e-mail-shell-backend.c:572
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../modules/mail/e-mail-shell-backend.c:482
+#: ../modules/mail/e-mail-shell-backend.c:581
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../modules/mail/e-mail-shell-backend.c:491
+#: ../modules/mail/e-mail-shell-backend.c:590
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
-#: ../modules/mail/e-mail-shell-backend.c:725
-msgid "Evolution Account Assistant"
-msgstr "Pomoćnik naloga Evolucije"
-
-#: ../modules/mail/e-mail-shell-backend.c:771
-msgid "Account Editor"
-msgstr "Uređivač naloga"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
-#: ../modules/mail/e-mail-shell-view.c:947
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view.c:972
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Disable this account"
-msgstr "Onemogućite ovaj nalog"
+msgstr "Isključite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 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:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 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:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Copy the selected folder into another folder"
 msgstr "Umnožite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 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:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Mar_k All Messages as Read"
 msgstr "Označi sve po_ruke kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 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:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 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:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Change the name of this folder"
-msgstr "Promenite ime ove fascikle"
+msgstr "Promenite naziv ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Select Message _Thread"
-msgstr "Izaberi raspravu"
+msgstr "Izaberi _raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 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:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 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:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 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:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -17303,205 +17460,210 @@ 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:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "N_one"
 msgstr "N_išta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 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:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Send queued items and retrieve new items"
 msgstr "Šalje pripremljene i dovlači nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 msgid "Send queued items in all accounts"
 msgstr "Pošaljite stavke na čekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "_Message Filters"
 msgstr "F_ilteri poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 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:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
 msgid "F_older"
-msgstr "Fas_cikla"
+msgstr "_Fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
 msgid "_Label"
-msgstr "_Oznaka"
+msgstr "_Natpis"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "C_reate Search Folder From Search..."
-msgstr "Napravi Fasciklu pretrage iz pretrage..."
+msgstr "Napravi _fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Show deleted messages with a line through them"
 msgstr "Prikažite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
+msgid "_Unmatched Folder Enabled"
+msgstr "Uključena _nepoklopljena fascikla"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
+msgid "Toggles whether Unmatched search folder is enabled"
+msgstr "Okida prilikom uključivanja nepoklopljene fascikle pretrage"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Show message preview below the message list"
 msgstr "Prikažite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Show message preview alongside the message list"
 msgstr "Prikažite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
-msgid "Recent Messages"
-msgstr "Skorašnje poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 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:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
 msgid "Current Account"
 msgstr "tekućem nalogu"
 
+# #-#-#-#-#  evolution.gnome-3-4.sr.po (evolution)  #-#-#-#-#
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
-#: ../modules/mail/e-mail-shell-view.c:560
+#: ../modules/mail/e-mail-shell-view.c:613
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:721
+#: ../modules/mail/e-mail-shell-view.c:709
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view.c:970
 msgid "Proxy _Logout"
 msgstr "_Odjava sa mrežnog posrednika"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:961
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -17510,7 +17672,7 @@ msgstr[1] "%d izabrane, "
 msgstr[2] "%d izabranih, "
 msgstr[3] "%d izabrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -17519,8 +17681,8 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -17529,7 +17691,7 @@ msgstr[1] "%d nepoželjne"
 msgstr[2] "%d nepoželjnih"
 msgstr[3] "%d nepoželjna"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -17538,7 +17700,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -17547,7 +17709,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1003
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -17556,7 +17718,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1015
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -17565,7 +17727,7 @@ msgstr[1] "%d nepročitane, "
 msgstr[2] "%d nepročitanih, "
 msgstr[3] "%d nepročitana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17574,80 +17736,80 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
+#: ../modules/mail/e-mail-shell-view-private.c:1454
 msgid "Send / Receive"
 msgstr "Pošalji / Primi"
 
-#: ../modules/mail/em-composer-prefs.c:513
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
 # bug: requires a comment on usage
 # slično kao za mesece i nedelje
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:86
 msgid "Every time"
 msgstr "svaki put"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:87
 msgid "Once per day"
 msgstr "jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:88
 msgid "Once per week"
 msgstr "jednom nedeljno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Once per month"
 msgstr "jednom mesečno"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "Sadrži vrednost"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1071
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1070
+#: ../modules/mail/em-mailer-prefs.c:1072
 msgid "Show _original header value"
 msgstr "Prikaži _originalnu vrednost zaglavlja"
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
-msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom e-pošte?"
+msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom el. pošte?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:258
+#: ../modules/mdn/evolution-mdn.c:318
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Vaša poruka za %s na temu „%s“ na %s je pročitana."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:324
+#: ../modules/mdn/evolution-mdn.c:385
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Obaveštenje o prijemu za „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:449
+#: ../modules/mdn/evolution-mdn.c:540
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Pošalji povratnicu čitanja za „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:454
+#: ../modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "Obavesti _pošiljaoca"
 
@@ -17679,7 +17841,7 @@ msgstr ""
 "Evolucija će se vratiti u režim na mreži kada mrežna veza bude bila "
 "uspostavljena."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:388
+#: ../modules/online-accounts/camel-sasl-xoauth.c:417
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17687,11 +17849,11 @@ msgstr ""
 "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ "
 "sa koje bih dobio pristup potvrđivanju identiteta."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:475
+#: ../modules/online-accounts/camel-sasl-xoauth.c:504
 msgid "OAuth"
 msgstr "OAut"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:477
+#: ../modules/online-accounts/camel-sasl-xoauth.c:506
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -17704,7 +17866,7 @@ msgstr "Autor(i)"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
-msgstr "Upravljač dodacima"
+msgstr "Upravnik priključaka"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:270
 msgid "Note: Some changes will not take effect until restart"
@@ -17727,415 +17889,509 @@ msgstr "_Priključci"
 msgid "Enable and disable plugins"
 msgstr "Uključuje i isključuje dodatke"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Probni priključak Piton"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:130
+msgid "Display plain text version"
+msgstr "Prikaži izdanje običnog teksta"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:132
+msgid "Display plain text version of multipart/alternative message"
+msgstr "Prikazuje izdanje običnog teksta poruke iz više delova ili neke druge"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
+msgid "Display HTML version"
+msgstr "Prikaži HTML izdanje"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+msgid "Display HTML version of multipart/alternative message"
+msgstr "Prikazuje izdanje HTML-a poruke iz više delova ili neke druge"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+msgid "Show HTML if present"
+msgstr "Prikaži HTML ako postoji"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+msgid "Let Evolution choose the best part to show."
+msgstr "Pušta da Evolucija izabere najbolji deo za prikaz."
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Probni priključak za pokretač EPriključka Pitona."
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:50
+msgid "Show plain text if present"
+msgstr "Prikaži običan tekst ako postoji"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Python Plugin Loader tests"
-msgstr "Testovi za pokretač priključka Pitona"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:51
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Prikazuje deo sa običnim tekstom, ako postoji, inače pušta da Evolucija "
+"izabere najbolji deo za prikaz."
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Hello Python"
-msgstr "Zdravo Piton"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:55
+msgid "Only ever show plain text"
+msgstr "Isključivo prikazuj običan tekst"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:190
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:56
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Uvek prikazuje deo sa običnim tekstom, prilažući ostale delove u poruku, po "
+"izboru."
+
+#: ../modules/prefer-plain/plugin/config-ui.c:107
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Prikaži po_tisnute HTML delove kao priloge"
+
+#: ../modules/prefer-plain/plugin/config-ui.c:129
+msgid "HTML _Mode"
+msgstr "HTML _režim"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Prednost daje tekstu"
+
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr "Model teksta"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "Pregleda poruke kao običan tekst, čak i ako sadrže HTML."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Nisam uspeo da izrodim Ubicu spama (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:213
+#: ../modules/spamassassin/evolution-spamassassin.c:215
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Nisam uspeo da pošaljem sadržaj poruke pošte do Ubice spama: "
 
 # bug: plural-forms
-#: ../modules/spamassassin/evolution-spamassassin.c:232
+#: ../modules/spamassassin/evolution-spamassassin.c:234
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Nisam uspeo da zapišem „%s“ u Ubici spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:260
+#: ../modules/spamassassin/evolution-spamassassin.c:262
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Nisam uspeo da pročitam izlaz iz Ubice spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:315
+#: ../modules/spamassassin/evolution-spamassassin.c:317
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "Ili se Ubica spama urušio ili nije uspeo da analizira poruku pošte"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:834
+#: ../modules/spamassassin/evolution-spamassassin.c:885
 msgid "SpamAssassin Options"
 msgstr "Opcije Ubice spama"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
+#: ../modules/spamassassin/evolution-spamassassin.c:900
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:863
+#: ../modules/spamassassin/evolution-spamassassin.c:914
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ovo će Ubicu spama učiniti pouzdanijim , ali sporijim."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1072
+#: ../modules/spamassassin/evolution-spamassassin.c:1123
 msgid "SpamAssassin"
 msgstr "Ubica spama"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:283
+#: ../modules/startup-wizard/e-mail-config-import-page.c:204
 #: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:315
+#: ../modules/startup-wizard/e-mail-config-import-page.c:233
 #: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:326
-#: ../modules/startup-wizard/evolution-startup-wizard.c:424
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "Uvozim datoteke"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:402
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
 msgid "Import cancelled."
 msgstr "Uvoženje je otkazano."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
 msgid "Import complete."
 msgstr "Uvoženje je završeno."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:494
-msgid "Evolution Setup Assistant"
-msgstr "Pomoćnik podešavanja Evolucije"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:500
-msgid "Welcome"
-msgstr "Dobrodošli"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:505
+#: ../modules/startup-wizard/e-startup-assistant.c:154
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
 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."
+"Dobrodošli u Evoluciju. \n"
+"\n"
+"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:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:259
 msgid "Loading accounts..."
 msgstr "Učitavam naloge..."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Lokalni adresari"
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+msgid "_Format as..."
+msgstr "Oblikuj _kao..."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Add local address books to Evolution."
-msgstr "Dodajte lokalne adresare u Evoluciju."
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+msgid "_Other languages"
+msgstr "_Drugi jezici"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:136
-msgid "_Do not show this message again."
-msgstr "_Ne prikazuj ponovo ovu poruku."
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:323
+msgid "Text Highlight"
+msgstr "Isticanje teksta"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:462
-msgid "Keywords"
-msgstr "Ključne reči"
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:329
+msgid "Syntax highlighting of mail parts"
+msgstr "Isticanje sadržaja delova pošte"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Message has no attachments"
-msgstr "Poruka nema priloge"
+#: ../modules/text-highlight/languages.c:32
+msgid "_Plain text"
+msgstr "_Običan tekst"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
-msgstr ""
-"Evolucija je pronašla neke ključne reči koje navode da bi poruka trebalo da "
-"sadrži prilog, ali isti ne može da pronađe."
+#  Translators: Menu item Verb/Connect/Couple/Assemble
+#: ../modules/text-highlight/languages.c:38
+msgid "_Assembler"
+msgstr "_Spajač"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add Attachment..."
-msgstr "_Dodaj prilog..."
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
+msgstr "_Baš"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Edit Message"
-msgstr "_Uredi poruku"
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
+msgstr "_C/C++"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Podsetnik priloga"
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
+msgstr "_C#"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "Podseća kada zaboravite da dodate prilog u poruku."
+#: ../modules/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
+msgstr "_Kaskadni stil lista"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Inline Audio"
-msgstr "Unutrašnji audio"
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
+msgstr "_HTML"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
-msgstr "Pušta audio priloge direktno u porukama."
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
+msgstr "_Java"
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
-msgstr "Direktorijum za rezervu Evolucije"
+#: ../modules/text-highlight/languages.c:87
+msgid "_JavaScript"
+msgstr "_Java skript"
 
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
-msgstr "Direktorijum za povraćaj Evolucije"
+#: ../modules/text-highlight/languages.c:93
+msgid "_Patch/diff"
+msgstr "_Zakrpe/razlike"
 
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
-msgstr "Proveri rezervu Evolucije"
+#: ../modules/text-highlight/languages.c:99
+msgid "_Perl"
+msgstr "_Perl"
 
-# shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "Ponovo pokreće Evoluciju"
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr "_PHP"
 
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "Sa grafičkim okruženjem"
+#: ../modules/text-highlight/languages.c:123
+msgid "_Python"
+msgstr "_Piton"
 
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:308
-#: ../plugins/backup-restore/backup.c:432
-msgid "Shutting down Evolution"
-msgstr "Gašenje Evolucije"
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
+msgstr "_Rubi"
 
-#: ../plugins/backup-restore/backup.c:317
-msgid "Backing Evolution accounts and settings"
-msgstr "Izradite rezervnu kopiju naloga i postavke Evolucije"
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr "_Tcl/Tk"
 
-#: ../plugins/backup-restore/backup.c:329
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zadaci, beleške)"
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr "_TeKs/LaTeKs"
 
-#: ../plugins/backup-restore/backup.c:345
-msgid "Back up complete"
-msgstr "Izrada rezervne kopije je završena"
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr "_Vala"
 
-# shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
-msgid "Restarting Evolution"
-msgstr "Ponovno pokretanje Evolucije"
+#: ../modules/text-highlight/languages.c:152
+msgid "_Visual Basic"
+msgstr "_Vizuel bejzik"
 
-#: ../plugins/backup-restore/backup.c:438
-msgid "Back up current Evolution data"
-msgstr "Napravite rezervu trenutnih podataka Evolucije"
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
+msgstr "_IksML"
 
-#: ../plugins/backup-restore/backup.c:446
-msgid "Extracting files from back up"
-msgstr "Izvlačim datoteke iz rezervne kopije"
+#: ../modules/text-highlight/languages.c:177
+msgid "_ActionScript"
+msgstr "_Skripta radnje"
 
-#: ../plugins/backup-restore/backup.c:515
-msgid "Loading Evolution settings"
-msgstr "Učitavam podešavanja Evolucije"
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
+msgstr "_ADA95"
+
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
+msgstr "_ALGOL 68"
+
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
+msgstr "(_G)AVK"
+
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr "_KOBOL"
+
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr "_DOS grupa"
+
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr "_D"
+
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr "_Erlang"
 
-#: ../plugins/backup-restore/backup.c:551
-msgid "Removing temporary back up files"
-msgstr "Uklanjanje privremenih rezervnih datoteka"
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
+msgstr "_FORTRAN 77"
 
-#: ../plugins/backup-restore/backup.c:563
-msgid "Ensuring local sources"
-msgstr "Nalazim lokalne izvore"
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr "_FORTRAN 90"
 
-#: ../plugins/backup-restore/backup.c:767
-msgid "Evolution Back Up"
-msgstr "Rezervni primerak Evolucije"
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr "_F#"
 
-#: ../plugins/backup-restore/backup.c:768
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr "Smeštam rezervni primerak u fasciklu „%s“"
+#: ../modules/text-highlight/languages.c:235
+msgid "_Go"
+msgstr "_Gou"
 
-#: ../plugins/backup-restore/backup.c:772
-msgid "Evolution Restore"
-msgstr "Povraćaj Evolucije"
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
+msgstr "_Haskel"
 
-#: ../plugins/backup-restore/backup.c:773
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "Vraćam iz fascikle „%s“"
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
+msgstr "_JSP"
 
-#: ../plugins/backup-restore/backup.c:841
-msgid "Backing up Evolution Data"
-msgstr "Izrađuje rezervni primerak podataka Evolucije"
+#: ../modules/text-highlight/languages.c:250
+msgid "_Lisp"
+msgstr "_Lisp"
 
-#: ../plugins/backup-restore/backup.c:842
-msgid "Please wait while Evolution is backing up your data."
-msgstr "Sačekajte dok Evolucija ne napravi rezervni primerak podataka."
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
+msgstr "_Lotus"
 
-# shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:844
-msgid "Restoring Evolution Data"
-msgstr "Povraćaj podataka Evolucije"
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
+msgstr "_Lua"
 
-#: ../plugins/backup-restore/backup.c:845
-msgid "Please wait while Evolution is restoring your data."
-msgstr "Sačekajte dok Evolucija ne vrati podatke u prvobitno stanje."
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
+msgstr "_Mejpl"
 
-#: ../plugins/backup-restore/backup.c:863
-msgid "This may take a while depending on the amount of data in your account."
-msgstr "Ovo može potrajati, u zavisnosti od količine podataka na nalogu."
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr "_Matlab"
 
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "Select name of the Evolution backup file"
-msgstr "Izaberite ime za rezervnu kopiju Evolucije"
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
+msgstr "_Maja"
 
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after backup"
-msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
+msgstr "_Oberon"
 
-#: ../plugins/backup-restore/backup-restore.c:285
-msgid "Select name of the Evolution backup file to restore"
-msgstr "Izaberite ime rezervne kopije Evolucije za povraćaj"
+#: ../modules/text-highlight/languages.c:288
+msgid "_Objective C"
+msgstr "_Objektni C"
 
-#: ../plugins/backup-restore/backup-restore.c:298
-msgid "_Restart Evolution after restore"
-msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
+msgstr "_OKeml"
 
-#: ../plugins/backup-restore/backup-restore.c:385
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"Evoluciju možete povratiti iz rezervne kopije. Možete da povratite poštu, "
-"kalendare, zadatke, beleške, kontakte. Takođe možete da povratite sve lične "
-"postavke, filtere za poštu, itd."
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
+msgstr "_Oktava"
 
-#: ../plugins/backup-restore/backup-restore.c:395
-msgid "_Restore Evolution from the backup file"
-msgstr "_Povrati Evoluciju iz datoteke rezervne kopije"
+# Mozda ipak "Portret"?
+#: ../modules/text-highlight/languages.c:304
+msgid "_Object Script"
+msgstr "_Objektni skript"
+
+#: ../modules/text-highlight/languages.c:309
+msgid "_Pascal"
+msgstr "_Paskal"
+
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
+msgstr "_POV-rej"
+
+#: ../modules/text-highlight/languages.c:319
+msgid "_Prolog"
+msgstr "_Prolog"
+
+#: ../modules/text-highlight/languages.c:324
+msgid "_PostScript"
+msgstr "_Postskript"
+
+#: ../modules/text-highlight/languages.c:329
+msgid "_R"
+msgstr "_R"
+
+#: ../modules/text-highlight/languages.c:334
+msgid "_RPM Spec"
+msgstr "_RPM navod"
+
+#: ../modules/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr "_Razmera"
+
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
+msgstr "_Smoltok"
+
+#: ../modules/text-highlight/languages.c:350
+msgid "_TCSH"
+msgstr "_TCSH"
+
+#: ../modules/text-highlight/languages.c:355
+msgid "_VHDL"
+msgstr "_VHDL"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
+msgid "Show F_ull vCard"
+msgstr "Prikaži _punu vKartu"
 
-#: ../plugins/backup-restore/backup-restore.c:405
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Izaberite arhivu Evolucije za povraćaj:"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
+msgid "Show Com_pact vCard"
+msgstr "Prikaži _sažetu vKartu"
 
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "Choose a file to restore"
-msgstr "Izaberite datoteku za povraćaj"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
+msgid "Save _To Addressbook"
+msgstr "Sačuvaj _u adresar"
 
-#: ../plugins/backup-restore/backup-restore.c:423
-msgid "Restore from backup"
-msgstr "Vraća iz rezervne kopije"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+msgid "There is one other contact."
+msgstr "Postoji još jedan kontakt."
 
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "_Back up Evolution Data..."
-msgstr "Napravi _rezervu podataka Evolucije..."
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Postoji još %d kontakt."
+msgstr[1] "Postoje još %d kontakta."
+msgstr[2] "Postoji još %d kontakta."
+msgstr[3] "Postoji još %d kontakt."
 
-#: ../plugins/backup-restore/backup-restore.c:472
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
+msgid "Addressbok Contact"
+msgstr "Kontakt adresara"
 
-# shell:noshell-reason title
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "R_estore Evolution Data..."
-msgstr "_Vrati podatke Evolucije..."
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+msgid "Display the part as an addressbook contact"
+msgstr "Prikažite delove kao kontakt adresara"
 
-#: ../plugins/backup-restore/backup-restore.c:479
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Vratite podatke i postavke Evolucije iz arhive"
+#: ../modules/web-inspector/evolution-web-inspector.c:88
+msgid "_Inspect..."
+msgstr "_Nadgledaj..."
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
-msgstr "Izrada rezerve i oporavak"
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr "Nadgledaj HTML sadržaj (uklanjanje grešaka)"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
-msgstr "Napravite rezervu i vratite podatke i postavke Evolucije."
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+msgid "Evolution Web Inspector"
+msgstr "Nadzornik veba Evolucije"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Invalid Evolution backup file"
-msgstr "Neispravna datoteka rezervnog primerka Evolucije"
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Izaberite ispravnu datoteku rezerve za povraćaj."
+#: ../plugins/attachment-reminder/attachment-reminder.c:590
+#: ../plugins/templates/templates.c:470
+msgid "Keywords"
+msgstr "Ključne reči"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Are you sure you want to close Evolution?"
-msgstr "Sigurno želite da zatvorite Evoluciju?"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "Poruka nema priloge"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 msgstr ""
-"Da napravite rezervnu kopiju vaših podataka i podešavanja, prvo morate da "
-"zatvorite Evoluciju. Budite sigurni da ste sačuvali nesačuvane podatke pre "
-"nego što nastavite."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Izaberite radnju:"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "Sigurno želite da povratite Evoluciju iz izabrane datoteke rezerve?"
+"Evolucija je pronašla neke ključne reči koje navode da bi poruka trebalo da "
+"sadrži prilog, ali isti ne može da pronađe."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
-msgstr ""
-"Da vratite podatke i podešavanja, prvo morate da zatvorite Evoluciju. Budite "
-"sigurni da ste sačuvali nesačuvane podatke pre nego što nastavite. Ovo će "
-"obrisati sve trenutne podatke Evolucije i podešavanja i vratiti one iz vaše "
-"rezerve."
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "_Dodaj prilog..."
 
-# shell:noshell-reason title
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Zatvorite i vratite Evoluciju"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Uredi poruku"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "Insufficient Permissions"
-msgstr "Nedovoljna ovlašćenja"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Podsetnik priloga"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "The selected folder is not writable."
-msgstr "U izabranu fasciklu se ne može pisati."
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Podseća kada zaboravite da dodate prilog u poruku."
 
-#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
+#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:674
 msgid "Create _address book entries when sending mails"
 msgstr "Napravi unose u _adresar pri slanju pošte"
 
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi adresar za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:717
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Instant Messaging Contacts"
 msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:732
+#: ../plugins/bbdb/bbdb.c:714
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Usklađuje slike i podatke kontakta sa listom drugara iz Pidžina"
 
-#: ../plugins/bbdb/bbdb.c:740
+#: ../plugins/bbdb/bbdb.c:722
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za listu prijatelja Pidžina"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:753
+#: ../plugins/bbdb/bbdb.c:735
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -18153,274 +18409,11 @@ msgid ""
 msgstr ""
 "Oslobađa vas teškog rada u upravljanju adresarom.\n"
 "\n"
-"Automatski popunjava adresar imenima i adresama e-pošte kada odgovarate na "
-"poruke. Takođe popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
-
-#: ../plugins/caldav/caldav-browse-server.c:215
-msgid "Authentication failed. Server requires correct login."
-msgstr "Potvrđivanje identiteta nije uspelo. Server zahteva ispravnu prijavu."
-
-#: ../plugins/caldav/caldav-browse-server.c:217
-msgid "Given URL cannot be found."
-msgstr "Ne mogu da pronađem datu adresu."
-
-#: ../plugins/caldav/caldav-browse-server.c:221
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"Server je dao neočekivan odgovor.\n"
-"%d — %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:361
-#: ../plugins/caldav/caldav-browse-server.c:695
-msgid "Failed to parse server response."
-msgstr "Nisam uspeo da raščlanim odgovor servera."
-
-#: ../plugins/caldav/caldav-browse-server.c:455
-msgid "Events"
-msgstr "Događaji"
-
-#: ../plugins/caldav/caldav-browse-server.c:477
-msgid "User's calendars"
-msgstr "Korisnički kalendari"
-
-#: ../plugins/caldav/caldav-browse-server.c:589
-#: ../plugins/caldav/caldav-browse-server.c:764
-msgid "Failed to get server URL."
-msgstr "Nisam uspeo da dobijem adresu servera."
-
-#: ../plugins/caldav/caldav-browse-server.c:762
-#: ../plugins/caldav/caldav-browse-server.c:803
-#: ../plugins/caldav/caldav-browse-server.c:1502
-msgid "Searching for user's calendars..."
-msgstr "Tražim korisničke kalendare..."
-
-#: ../plugins/caldav/caldav-browse-server.c:801
-msgid "Could not find any user calendar."
-msgstr "Ne mogu da pronađem nijedan kalendar."
-
-#: ../plugins/caldav/caldav-browse-server.c:939
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "Prethodni pokušaj nije uspeo: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:941
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "Prethodni pokušaj nije uspeo, kod %d"
-
-#: ../plugins/caldav/caldav-browse-server.c:946
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "Unesite lozinku za korisnika %s na serveru %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1009
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr "Ne mogu da napravim poruku baze za adresu „%s“"
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1267
-msgid "Searching folder content..."
-msgstr "Pretražujem sadržaj fascikle..."
-
-#: ../plugins/caldav/caldav-browse-server.c:1326
-#: ../plugins/caldav/caldav-source.c:261
-msgid "Server _handles meeting invitations"
-msgstr "Server _upravlja pozivima na sastanak"
-
-#: ../plugins/caldav/caldav-browse-server.c:1333
-msgid "List of available calendars:"
-msgstr "Spisak dostupnih kalendara:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1371
-msgid "Supports"
-msgstr "Podrške"
-
-#: ../plugins/caldav/caldav-browse-server.c:1402
-#: ../plugins/caldav/caldav-source.c:259
-msgid "User e_mail:"
-msgstr "_E-pošta korisnika:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1478
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr "Nisam uspeo da napravim nit: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1599
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "Adresa servera „%s“ nije ispravna"
-
-#: ../plugins/caldav/caldav-browse-server.c:1609
-msgid "Browse for a CalDAV calendar"
-msgstr "Traži KolDAV kalendar"
-
-#: ../plugins/caldav/caldav-source.c:240
-#: ../plugins/calendar-http/calendar-http.c:109
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "_URL:"
-msgstr "_Adresa :"
-
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:149
-#: ../plugins/google-account-setup/google-contacts-source.c:359
-msgid "Use _secure connection"
-msgstr "_Koristi sigurnu vezu"
-
-#: ../plugins/caldav/caldav-source.c:264
-msgid "Brows_e server for a calendar"
-msgstr "Po_traži kalendar na serveru"
-
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/calendar-file/calendar-file.c:207
-#: ../plugins/calendar-http/calendar-http.c:132
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Re_fresh:"
-msgstr "O_sveži:"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Support"
-msgstr "Podrška za KolDAV"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "Add CalDAV support to Evolution."
-msgstr "Dodajte KolDAV podršku u Evoluciju."
-
-#: ../plugins/calendar-file/calendar-file.c:136
-#| msgid "_Customize options"
-msgid "C_ustomize options"
-msgstr "_Prilagodi opcije"
-
-#: ../plugins/calendar-file/calendar-file.c:155
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "_Ime datoteke:"
-
-#: ../plugins/calendar-file/calendar-file.c:160
-msgid "Choose calendar file"
-msgstr "Izaberite datoteku kalendara"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:213
-msgid "On open"
-msgstr "Pri otvaranju"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:215
-msgid "On file change"
-msgstr "Pri izmeni datoteke"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:217
-msgid "Periodically"
-msgstr "Periodično"
-
-#: ../plugins/calendar-file/calendar-file.c:238
-msgid "Force read _only"
-msgstr "Prisili _samo čitanje"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Lokalni kalendari"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Add local calendars to Evolution."
-msgstr "Dodajte lokalne kalendare u Evoluciju."
-
-#: ../plugins/calendar-http/calendar-http.c:214
-msgid "Userna_me:"
-msgstr "Korisničko_ime:"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Web Calendars"
-msgstr "Veb kalendari"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Add web calendars to Evolution."
-msgstr "Dodajte veb kalendare u Evoluciju."
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "Vreme: magla"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "Vreme: oblačno"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "Vreme: oblačna noć"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "Vreme: tmurno"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "Vreme: kiša"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "Vreme: sneg"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "Vreme: sunčano"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "Vreme: vedra noć"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "Vreme: grmljavine"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "Izaberite mesto"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "Ništa"
-
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "_Jedinice:"
-
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "Metrične (Celzijus, cm, itd.)"
-
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "Imperijalne (Farenhajt, inči, itd.)"
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Weather Calendars"
-msgstr "Kalendari vremena"
+"Automatski popunjava adresar imenima i adresama el. pošte kada odgovarate na "
+"poruke. Takođe popunjava podatke za kontakt brzim glasnikom iz spiska "
+"drugara."
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Add weather calendars to Evolution."
-msgstr "Dodaje kalendare za vreme u Evoluciju."
-
-#: ../plugins/dbx-import/dbx-importer.c:292
+#: ../plugins/dbx-import/dbx-importer.c:287
 msgid "Importing Outlook Express data"
 msgstr "Uvozim podatke Autluk Ekspresa"
 
@@ -18436,35 +18429,7 @@ msgstr "Lične fascikle Autluk Ekspresa 5/6 (.pst)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Uvozi poruke Autluk Ekspresa iz DBH datoteke"
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr "Označava kao _podrazumevan adresar"
-
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr "Sam _dopunjava ovim adresarom"
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "Označava kao _podrazumevan kalendar"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "Označava kao _podrazumevan spisak zadataka"
-
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr "Označava kao _podrazumevan spisak beleški"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Podrazumevani izvori"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr "Označava omiljen adresar i kalendar kao podrazumevane."
-
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sigurnost:"
@@ -18472,32 +18437,32 @@ msgstr "Sigurnost:"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../plugins/email-custom-header/email-custom-header.c:305
+#: ../plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Lično"
 
-#: ../plugins/email-custom-header/email-custom-header.c:306
+#: ../plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nerazvrstano"
 
-#: ../plugins/email-custom-header/email-custom-header.c:307
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Zaštićeno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:308
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../plugins/email-custom-header/email-custom-header.c:309
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Tajno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:310
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Strogo poverljivo"
@@ -18507,17 +18472,17 @@ msgstr "Strogo poverljivo"
 # 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.
-#: ../plugins/email-custom-header/email-custom-header.c:367
+#: ../plugins/email-custom-header/email-custom-header.c:357
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ništa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
+#: ../plugins/email-custom-header/email-custom-header.c:530
 msgid "_Custom Header"
 msgstr "_Prilagođeno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:803
+#: ../plugins/email-custom-header/email-custom-header.c:799
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18525,12 +18490,12 @@ msgstr ""
 "Format za navođenje ključa prilagođenog zaglavlja je:\n"
 "Vrednosti naziv ključa prilagođenog zaglavlja su razdvojeni sa „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
+#: ../plugins/email-custom-header/email-custom-header.c:851
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
-#: ../plugins/templates/templates.c:470
+#: ../plugins/email-custom-header/email-custom-header.c:867
+#: ../plugins/templates/templates.c:478
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -18545,16 +18510,11 @@ msgstr "Dodajte prilagođena zaglavlja odlaznim porukama."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
-msgstr "Prilagođeno zaglavlje e-pošte"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr ""
-"Automatski pokreće uređivač kada je pritisnut taster u sastavljaču poruke"
+msgstr "Prilagođeno zaglavlje el. pošte"
 
 #: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
-msgstr "Naredba za izvršavanje radi pokretanja uređivača:"
+msgstr "Naredba za izvršavanje radi pokretanja uređivača: "
 
 #: ../plugins/external-editor/external-editor.c:115
 msgid ""
@@ -18635,7 +18595,7 @@ msgstr "Uključi _sliku"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
-msgstr "Prilaže sličicu Vašeg lica odlazećim porukama."
+msgstr "Prilaže sličicu vašeg lica odlazećim porukama."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
@@ -18662,48 +18622,6 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 "Izabrana datoteka izgleda da nije slika ispravnog „.png“ formata. Greška: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
-msgid "Server"
-msgstr "Server"
-
-#: ../plugins/google-account-setup/google-source.c:457
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Unesite lozinku za korisnika „%s“ radi pristupa listi prijavljenih kalendara."
-
-#: ../plugins/google-account-setup/google-source.c:569
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"Ne mogu da pročitam podatke sa Gugl servera.\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:840
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-msgid "Unknown error."
-msgstr "Nepoznata greška."
-
-#: ../plugins/google-account-setup/google-source.c:670
-msgid "Cal_endar:"
-msgstr "Kal_endar:"
-
-#: ../plugins/google-account-setup/google-source.c:707
-msgid "Retrieve _List"
-msgstr "Dovuci _listu"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Google Calendars"
-msgstr "Kalendari Gugla"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Add Google Calendars to Evolution."
-msgstr "Dodajte kalendare Gugla u Evoluciju."
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Unutrašnja slika"
@@ -18712,844 +18630,55 @@ msgstr "Unutrašnja slika"
 msgid "View image attachments directly in mail messages."
 msgstr "Pregledajte priloge sa slikama direktno u porukama."
 
-#: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "Custom Headers"
-msgstr "Prilagođena zaglavlja"
-
-#: ../plugins/imap-features/imap-headers.c:356
-#: ../plugins/imap-features/imap-headers.ui.h:7
-msgid "IMAP Headers"
-msgstr "IMAP zaglavlja"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"Izaberite postavke IMAP zaglavlja. \n"
-"Što više zaglavlja imate više će vremena biti potrebno za njihovo preuzimanje."
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid "_Fetch All Headers"
-msgstr "_Pribavi sva zaglavlja"
-
-#: ../plugins/imap-features/imap-headers.ui.h:4
-msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-"_Osnovna zaglavlja — (Najbrže) \n"
-"Koristite ovo ukoliko nemate filtere na dopisnim listama"
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Osnovna i zaglavlja _Dopisnih lista (Podrazumevano)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim "
-"zaglavljima. \n"
-"Izborom „Sva zaglavlja“ ovo možete ignorisati."
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "IMAP Features"
-msgstr "IMAP mogućnosti"
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-msgid "Fine-tune your IMAP accounts."
-msgstr "Fino podesite IMAP naloge."
-
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:505
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "Ne mogu da učitam kalendara „%s“ (%s)"
-
-#: ../plugins/itip-formatter/itip-formatter.c:665
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "Jedno zakazivanje u kalendaru „%s“ je u isto vreme kad i ovaj sastanak"
-
-#: ../plugins/itip-formatter/itip-formatter.c:689
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
-
-#: ../plugins/itip-formatter/itip-formatter.c:802
-msgid "Unable to find any calendars"
-msgstr "Ne mogu da pronađem nijedan kalendar"
-
-#: ../plugins/itip-formatter/itip-formatter.c:809
-msgid "Unable to find this meeting in any calendar"
-msgstr "Ne mogu da pronađem ovaj sastanak ni u jednom kalendaru"
-
-#: ../plugins/itip-formatter/itip-formatter.c:813
-msgid "Unable to find this task in any task list"
-msgstr "Ne mogu da pronađem ovaj zadatak ni u jednom spisku zadataka"
-
-#: ../plugins/itip-formatter/itip-formatter.c:817
-msgid "Unable to find this memo in any memo list"
-msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1119
-msgid "Opening the calendar. Please wait..."
-msgstr "Otvaram kalendar. Molim sačekajte..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1122
-msgid "Searching for an existing version of this appointment"
-msgstr "Pretraga za jednom postojećom verzijom ovog zakazivanja je u toku"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1484
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Ne mogu da pošaljem stavke kalendaru „%s“.  %s"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1498
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1502
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr "Poslato kalendaru „%s“ kao pokušaj"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1507
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr "Poslato kalendaru „%s“ kao odbijeno"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1512
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr "Poslato kalendaru „%s“ kao otkazano"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1581
-#: ../plugins/itip-formatter/itip-formatter.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:2065
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1620
-msgid "Unable to parse item"
-msgstr "Ne mogu da obradim stavku"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr "Organizator je uklonio delegata „%s“ "
-
-#: ../plugins/itip-formatter/itip-formatter.c:1807
-msgid "Sent a cancelation notice to the delegate"
-msgstr "Delegatu je poslato obaveštenje o otkazivanju"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1809
-msgid "Could not send the cancelation notice to the delegate"
-msgstr "Ne mogu delegatu da pošaljem obaveštenje o otkazivanju"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#, c-format
-msgid "Unable to update attendee. %s"
-msgstr "Ne mogu da ažuriram učesnika. %s"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1861
-msgid "Attendee status updated"
-msgstr "Status učesnika je ažuriran"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1881
-msgid "The meeting is invalid and cannot be updated"
-msgstr "Sastanak nije ispravan i ne može biti ažuriran"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1947
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Status učesnika nije ažuriran zbog neispravnog stanja"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2042
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Status učesnika nije osvežen jer stavka više ne postoji"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2086
-msgid "Meeting information sent"
-msgstr "Podatak o sastanku je poslat"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2089
-msgid "Task information sent"
-msgstr "Podatak o zadatku je poslat"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2092
-msgid "Memo information sent"
-msgstr "Podatak o belešci je poslat"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2101
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "Ne mogu da pošaljem podatak o sastanku, sastanak ne postoji"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2104
-msgid "Unable to send task information, the task does not exist"
-msgstr "Ne mogu da pošaljem podatak o zadatku, zaduženje ne postoji"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2107
-msgid "Unable to send memo information, the memo does not exist"
-msgstr "Ne mogu da pošaljem podatak o belešci, beleška ne postoji"
-
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
-msgid "calendar.ics"
-msgstr "calendar.ics"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2178
-msgid "Save Calendar"
-msgstr "Sačuvaj kalendar"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-#: ../plugins/itip-formatter/itip-formatter.c:2252
-msgid "The calendar attached is not valid"
-msgstr "Priložen kalendar nije ispravan"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
-"iKalendar."
-
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
-msgid "The item in the calendar is not valid"
-msgstr "Stavka u kalendaru nije ispravna"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
-"slobodno/zauzeto."
-
-#: ../plugins/itip-formatter/itip-formatter.c:2335
-msgid "The calendar attached contains multiple items"
-msgstr "Kalendar u prilogu sadrži više stavki"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2336
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"Radi obrade svih ovih stavki, potrebno je datoteku sačuvati a kalendar uvesti"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#: ../plugins/itip-formatter/itip-formatter.c:2860
-msgctxt "cal-itip"
-msgid "None"
-msgstr "Ništa"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2876
-msgid "Tentatively Accepted"
-msgstr "Prihvaćeno s rezervom"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2994
-msgid "This meeting recurs"
-msgstr "Ovaj sastanak se ponavlja"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2997
-msgid "This task recurs"
-msgstr "Ovaj zadatak se ponavlja"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3000
-msgid "This memo recurs"
-msgstr "Ova beleška se ponavlja"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3231
-msgid "Meeting Invitations"
-msgstr "Pozivnice za sastanak"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3257
-msgid "_Delete message after acting"
-msgstr "_Obriši poruku nakon radnje"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
-msgid "Conflict Search"
-msgstr "Pretraga preklapanja"
-
-#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3286
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Bira kalendare za pretragu preklapanja u sastancima"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
-msgid "Today %H:%M"
-msgstr "Danas u %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
-msgid "Today %H:%M:%S"
-msgstr "Danas u %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
-msgid "Today %l:%M:%S %p"
-msgstr "Danas u %l:%M:%S %p"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
-msgid "Tomorrow %H:%M"
-msgstr "Sutra u %H:%M"
-
-# strftime format of a time in 24-hour format.
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
-msgid "Tomorrow %H:%M:%S"
-msgstr "Sutra u %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
-msgid "Tomorrow %l:%M %p"
-msgstr "Sutra u %l:%M %p"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "Sutra u %l:%M %S %p"
-
-#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
-#, c-format
-msgid "%A"
-msgstr "%A"
-
-# strftime format of a time in 24-hour format,
-# without seconds.
-# This is a strftime() format. %H = hour (0-23), %M = minute.
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
-
-# strftime format of a time in 24-hour format.
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
-msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
-
-# strftime format of a time in 12-hour format.
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
-msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
-
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
-msgid "%A, %B %e"
-msgstr "%A, %B %e"
-
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %e %H:%M"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %B %e %H:%M:%S"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %B %e %l:%M %p"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %B %e %l:%M:%S %p"
-
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
-msgid "%A, %B %e, %Y"
-msgstr "%A, %B %e, %Y."
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
-msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %e, %Y. %H:%M"
-
-# strptime format of a weekday, a date and a time,
-# in 24-hour format.
-# strftime format of a weekday, a date and a
-# time, in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
-msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %B %e, %Y. %H:%M:%S"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
-msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %B %e, %Y. %l:%M %p"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %B %e, %Y. %l:%M:%S %p"
-
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
-msgid "An unknown person"
-msgstr "Nepoznata osoba"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
-#, c-format
-msgid "Please respond on behalf of %s"
-msgstr "Odgovorite u ime %s"
-
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
-#, c-format
-msgid "Received on behalf of %s"
-msgstr "Primljeno u ime %s"
-
-#: ../plugins/itip-formatter/itip-view.c:379
-#, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr "%s preko %s objavljuje sledeći podatak o sastanku:"
-
-#: ../plugins/itip-formatter/itip-view.c:381
-#, c-format
-msgid "%s has published the following meeting information:"
-msgstr "%s objavljuje sledeći podatak o sastanku:"
-
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr "%s vam delegira sledeći sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:389
-#, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr "%s preko %s zahteva vaše prisustvo na sledećem sastanku:"
-
-#: ../plugins/itip-formatter/itip-view.c:391
-#, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr "%s zahteva vaše prisustvo na sledećem sastanku:"
-
-#: ../plugins/itip-formatter/itip-view.c:397
-#, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "%s preko %s želi da doda postojećem sastanku:"
-
-#: ../plugins/itip-formatter/itip-view.c:399
-#, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr "%s želi da doda postojećem sastanku:"
-
-#: ../plugins/itip-formatter/itip-view.c:403
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr "%s preko %s želi da primi najnovije informacije za sledeći sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:405
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "%s želi da primi najnoviji podatak za sledeći sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:409
-#, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr "%s preko %s šalje sledeći odgovor za sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:411
-#, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr "%s šalje sledeći odgovor za sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:415
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr "%s preko %s otkazuje sledeći sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:417
-#, c-format
-msgid "%s has canceled the following meeting:"
-msgstr "%s otkazuje sledeći sastanak:"
-
-#: ../plugins/itip-formatter/itip-view.c:421
-#, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr "%s preko %s predlaže sledeće promene sastanka."
-
-#: ../plugins/itip-formatter/itip-view.c:423
-#, c-format
-msgid "%s has proposed the following meeting changes:"
-msgstr "%s predlaže sledeće izmene sastanka:"
-
-#: ../plugins/itip-formatter/itip-view.c:427
-#, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr "%s preko %s odbija sledeće promene sastanka:"
-
-#: ../plugins/itip-formatter/itip-view.c:429
-#, c-format
-msgid "%s has declined the following meeting changes:"
-msgstr "%s odbija sledeće izmene sastanka:"
-
-#: ../plugins/itip-formatter/itip-view.c:467
-#, c-format
-msgid "%s through %s has published the following task:"
-msgstr "%s preko %s objavljuje sledeći zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:469
-#, c-format
-msgid "%s has published the following task:"
-msgstr "%s objavi sledeće zaduženje:"
-
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr "%s zahteva da %s preuzme sledeći zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:477
-#, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr "%s preko %s vam dodeljuje zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:479
-#, c-format
-msgid "%s has assigned you a task:"
-msgstr "%s Vam dodeljuje zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:485
-#, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr "%s preko %s želi da doda postojećem zadatku:"
-
-#: ../plugins/itip-formatter/itip-view.c:487
-#, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr "%s želi da doda postojećem zadatku:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"%s preko %s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:493
-#, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr "%s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%s preko %s vraća sledeći odgovor na dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:499
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr "%s šalje nazad sledeći odgovor na dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:503
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr "%s preko %s otkazuje sledeći dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:505
-#, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr "%s otkazuje sledeći dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:509
-#, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "%s preko %s predlaže sledeće promene u dodeli zadatka:"
-
-#: ../plugins/itip-formatter/itip-view.c:511
-#, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr "%s predlaže sledeće promene u dodeli zadatka:"
-
-#: ../plugins/itip-formatter/itip-view.c:515
-#, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr "%s preko %s odbija sledeći dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:517
-#, c-format
-msgid "%s has declined the following assigned task:"
-msgstr "%s odbija sledeći dodeljeni zadatak:"
-
-#: ../plugins/itip-formatter/itip-view.c:554
-#, c-format
-msgid "%s through %s has published the following memo:"
-msgstr "%s preko %s objavljuje sledeću belešku:"
-
-#: ../plugins/itip-formatter/itip-view.c:556
-#, c-format
-msgid "%s has published the following memo:"
-msgstr "%s objavljuje sledeću belešku:"
-
-#: ../plugins/itip-formatter/itip-view.c:561
-#, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr "%s preko %s želi da doda postojećoj belešci:"
-
-#: ../plugins/itip-formatter/itip-view.c:563
-#, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr "%s želi da doda postojećoj belešci:"
-
-#: ../plugins/itip-formatter/itip-view.c:567
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr "%s preko %s otkazuje sledeću deljenu belešku:"
-
-#: ../plugins/itip-formatter/itip-view.c:569
-#, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr "%s otkazuje sledeće deljenu belešku:"
-
-#: ../plugins/itip-formatter/itip-view.c:693
-msgid "All day:"
-msgstr "Celodnevno:"
-
-#: ../plugins/itip-formatter/itip-view.c:703
-msgid "Start day:"
-msgstr "Početak dana:"
-
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
-msgid "Start time:"
-msgstr "Vreme početka:"
-
-#: ../plugins/itip-formatter/itip-view.c:715
-msgid "End day:"
-msgstr "Kraj dana:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:1072
-msgid "End time:"
-msgstr "Vreme završetka:"
-
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "O_tvori kalendar"
-
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
-msgid "_Decline"
-msgstr "_Odbij"
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
-msgid "A_ccept"
-msgstr "_Prihvati"
-
-#: ../plugins/itip-formatter/itip-view.c:861
-msgid "_Decline all"
-msgstr "Od_bij sve"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "Sve sa re_zervom"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
-msgid "_Tentative"
-msgstr "Sa _rezervom"
-
-#: ../plugins/itip-formatter/itip-view.c:863
-msgid "A_ccept all"
-msgstr "P_rihvati sve"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Send Information"
-msgstr "Pošalji podat_ke"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update Attendee Status"
-msgstr "Ažuriraj stanje učesni_ka"
-
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "_Ažuriraj"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
-msgid "Comment:"
-msgstr "Komentar:"
-
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "_Odgovori pošiljaocu"
-
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "Pošalji _ažurirane podatke učesnicima"
-
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "Pri_meni na sve nivoe"
-
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "Prikaži vreme kao _slobodno"
-
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "_Očuvaj moj podsetnik"
-
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "_Nasledi podsetnik"
-
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "Za_daci:"
-
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "_Beleške:"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip formatiranje"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Prikazuje MIME delove „text/calendar“ u porukama."
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "Ovaj odgovor nije poslao prisutan učesnik. Dodati ga u prisutne?"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "This meeting has been delegated"
-msgstr "Ovaj sastanak je delegiran"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr "„{0}“ delegira sastanak. Želite li da dodate delegata „{1}“?"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "Get an archive of the list this message belongs to"
 msgstr "Pribavlja arhivu liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _korišćenju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Pribavlja podatke o korišćenju liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Javite se vlasniku dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
 msgid "_Post Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Sastavite poruku za dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Prijavite se na dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
 msgid "_Unsubscribe from List"
 msgstr "O_djavi se sa liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Odjavite se sa dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -19624,7 +18753,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
-msgstr "Nema radnje za e-poštu"
+msgstr "Nema radnje za el. poštu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
@@ -19638,35 +18767,8 @@ msgstr ""
 "\n"
 "Zaglavlje: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
-#, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
-msgstr[0] ""
-"Primili ste %d novu poruku\n"
-"u %s."
-msgstr[1] ""
-"Primili ste %d nove poruke\n"
-"u %s."
-msgstr[2] ""
-"Primili ste %d novih poruka\n"
-"u %s."
-msgstr[3] ""
-"Primili ste %d novu poruku\n"
-"u %s."
-
-#. Translators: "Subject:" is preceding a new mail
-#. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
-#, c-format
-msgid "Subject: %s"
-msgstr "Naslov: %s"
-
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:421
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19675,44 +18777,50 @@ msgstr[1] "Primili ste %d nove poruke."
 msgstr[2] "Primili ste %d novih poruka."
 msgstr[3] "Primili ste novu poruku."
 
-#: ../plugins/mail-notification/mail-notification.c:429
-#: ../plugins/mail-notification/mail-notification.c:437
-#: ../plugins/mail-notification/mail-notification.c:440
-msgid "New email"
-msgstr "Nova poruka"
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:410
+#, c-format
+msgid "Subject: %s"
+msgstr "Naslov: %s"
+
+# shell:noshell-reason title
+#: ../plugins/mail-notification/mail-notification.c:427
+msgid "New email in Evolution"
+msgstr "Nova pošta u Evoluciji"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid "Show %s"
 msgstr "Prikaži %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:658
 msgid "_Play sound when a new message arrives"
-msgstr "_Zvučno obavesti kada stigne nova poruka"
+msgstr "Zvučno _obavesti kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "_Beep"
 msgstr "_Zapišti"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:722
 msgid "Play _file:"
-msgstr "Pusti _zvučnu datoteku:"
+msgstr "Pusti zvučnu _datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:731
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:787
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _Sanduče"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:797
 msgid "Show _notification when a new message arrives"
 msgstr "Prikaži _obaveštenje kada pristigne nova poruka"
 
@@ -19725,12 +18833,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Obaveštava vas kada stigne nova poruka."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:243
+#: ../plugins/mail-to-task/mail-to-task.c:239
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Sačinjeno iz poruke koju šalje %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19739,7 +18847,7 @@ msgstr ""
 "Izabrani kalendar već sadrži događaj „%s“. Želite li da uredite stari "
 "događaj?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../plugins/mail-to-task/mail-to-task.c:625
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19747,7 +18855,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži zadatak „%s“. Želite li da uredite stari zadatak?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:628
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19756,7 +18864,7 @@ msgstr ""
 "Izabrani spisak već sadrži belešku „%s“. Želite li da uredite staru belešku?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:647
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19778,7 +18886,7 @@ msgstr[3] ""
 "dodate?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19800,7 +18908,7 @@ msgstr[3] ""
 "dodate?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:655
+#: ../plugins/mail-to-task/mail-to-task.c:659
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19821,29 +18929,33 @@ 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:676
+#: ../plugins/mail-to-task/mail-to-task.c:680
 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:751
+#: ../plugins/mail-to-task/mail-to-task.c:755
 msgid "[No Summary]"
 msgstr "[Bez sažetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:767
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraćen sa servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:815
+#: ../plugins/mail-to-task/mail-to-task.c:819
 #, 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:840
+#: ../plugins/mail-to-task/mail-to-task.c:844
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne mogu da otvorim kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:844
+msgid "Unknown error."
+msgstr "Nepoznata greška."
+
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19851,7 +18963,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:850
+#: ../plugins/mail-to-task/mail-to-task.c:854
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19859,7 +18971,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:853
+#: ../plugins/mail-to-task/mail-to-task.c:857
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19867,45 +18979,39 @@ msgstr ""
 "Izabrani izvor je samo za čitanje, stoga ne možete napraviti belešku. "
 "Izaberite drugi izvor."
 
-# mail:no-copy-folder-nostore secondary
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr "Ne mogu da dobavim spisak izvora. %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1164
+#: ../plugins/mail-to-task/mail-to-task.c:1187
 msgid "No writable calendar is available."
 msgstr "Nema dostupnog kalendara za upisivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
-msgid "Create an _Event"
-msgstr "Napravi _događaj"
+#: ../plugins/mail-to-task/mail-to-task.c:1271
+msgid "Create an _Appointment"
+msgstr "Napravi _zakazivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 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:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a Mem_o"
 msgstr "Napravi belešk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 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:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1297
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
@@ -19923,18 +19029,18 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr ""
 "Želite li da označite poruke kao pročitane samo u trenutnoj fascikli, ili i "
-"one u podfasciklama? "
+"one u podfasciklama?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:216
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current Folder and _Subfolders"
 msgstr "U trenutnoj fascikli i _podfasciklama"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:230
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../plugins/mark-all-read/mark-all-read.c:576
+#: ../plugins/mark-all-read/mark-all-read.c:545
 msgid "Mark Me_ssages as Read"
 msgstr "Označi po_ruke kao pročitane"
 
@@ -19944,60 +19050,7 @@ msgstr "Označi sve kao pročitano"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark all messages in a folder as read."
-msgstr "Označava sve poruke u fascikli kao pročitane."
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid "Prefer Plain Text"
-msgstr "Prednost daje tekstu"
-
-#. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Plain Text Mode"
-msgstr "Model teksta"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "Pregleda poruke kao običan tekst, čak i ako sadrže HTML."
-
-#: ../plugins/prefer-plain/prefer-plain.c:250
-msgid "Show HTML if present"
-msgstr "Prikaži HTML ako postoji"
-
-#: ../plugins/prefer-plain/prefer-plain.c:251
-msgid "Let Evolution choose the best part to show."
-msgstr "Pušta da Evolucija izabere najbolji deo za prikaz."
-
-#: ../plugins/prefer-plain/prefer-plain.c:254
-msgid "Show plain text if present"
-msgstr "Prikaži običan tekst ako postoji"
-
-#: ../plugins/prefer-plain/prefer-plain.c:255
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"Prikazuje deo sa običnim tekstom, ako postoji, inače pušta da Evolucija "
-"izabere najbolji deo za prikaz."
-
-#: ../plugins/prefer-plain/prefer-plain.c:259
-msgid "Only ever show plain text"
-msgstr "Isključivo prikazuj običan tekst"
-
-#: ../plugins/prefer-plain/prefer-plain.c:260
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"Uvek prikazuje deo sa običnim tekstom, prilažući ostale delove u poruku, po "
-"izboru."
-
-#: ../plugins/prefer-plain/prefer-plain.c:311
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr "Prikaži po_tisnute HTML delove kao priloge"
-
-#: ../plugins/prefer-plain/prefer-plain.c:333
-msgid "HTML _Mode"
-msgstr "HTML _režim"
+msgstr "Označite sve poruke u fascikli kao pročitane."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
@@ -20011,38 +19064,37 @@ msgstr "Lične fascikle Autluka (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Uvozi Autluk poruke iz PST datoteke"
 
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:594
 msgid "_Address Book"
 msgstr "_Adresar"
 
-#: ../plugins/pst-import/pst-importer.c:586
+#: ../plugins/pst-import/pst-importer.c:599
 msgid "A_ppointments"
 msgstr "Za_kazano"
 
-#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Zadaci"
 
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:609
 msgid "_Journal entries"
 msgstr "Unosi _dnevnika"
 
-#: ../plugins/pst-import/pst-importer.c:707
+#: ../plugins/pst-import/pst-importer.c:721
 msgid "Importing Outlook data"
 msgstr "Uvozim Autluk podatke"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:145
+#: ../plugins/publish-calendar/publish-calendar.c:152
 msgid "Calendar Publishing"
 msgstr "Objavljivanje kalendara"
 
@@ -20054,49 +19106,49 @@ msgstr "Mesta"
 msgid "Publish calendars to the web."
 msgstr "Objavite kalendare na veb."
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:469
+#: ../plugins/publish-calendar/publish-calendar.c:211
+#: ../plugins/publish-calendar/publish-calendar.c:465
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ne mogu da otvorim %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:220
+#: ../plugins/publish-calendar/publish-calendar.c:213
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Ne mogu da otvorim %s: nepoznata greška"
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../plugins/publish-calendar/publish-calendar.c:233
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Došlo je do greške prilikom objavljivanja na %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Objavljivanje na %s je uspešno završeno"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:279
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Nisam uspeo da montiram %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:628
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: ../plugins/publish-calendar/publish-calendar.c:765
+#: ../plugins/publish-calendar/publish-calendar.c:776
 msgid "Are you sure you want to remove this location?"
 msgstr "Sigurno želite da uklonite ovu lokaciju?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1106
 msgid "Could not create publish thread."
 msgstr "Ne mogu da objavim raspravu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1114
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
@@ -20114,7 +19166,7 @@ msgstr "Nedeljno"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
-msgstr "Ručno (preko menija „Radnje“)"
+msgstr "Ručno (preko izbornika „Radnje“)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Secure FTP (SFTP)"
@@ -20130,7 +19182,7 @@ msgstr "FTP (sa prijavom)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Windows share"
-msgstr "Deljeni prozor"
+msgstr "Vindouz deljenje"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "WebDAV (HTTP)"
@@ -20142,7 +19194,7 @@ msgstr "Bezbedni VebDAV (HTTPS)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Custom Location"
-msgstr "Prilagođena lokacija"
+msgstr "Proizvoljna putanja"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "_Publish as:"
@@ -20162,11 +19214,11 @@ msgstr "Izvori"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 msgid "Service _type:"
-msgstr "_Vrsta servisa:"
+msgstr "_Vrsta usluge:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
-msgstr "Dato_teka:"
+msgstr "_Datoteka:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "P_ort:"
@@ -20188,106 +19240,106 @@ msgstr "_Zapamti lozinku"
 msgid "Publishing Location"
 msgstr "Mesto objavljivanja"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
+#: ../plugins/publish-calendar/publish-format-fb.c:97
+#: ../plugins/publish-calendar/publish-format-ical.c:95
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Ne mogu da objavim kalendar: pozadinski proces više ne postoji"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:521
+#: ../plugins/publish-calendar/url-editor-dialog.c:539
 msgid "New Location"
-msgstr "Nova lokacija"
+msgstr "Novo mesto"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:523
+#: ../plugins/publish-calendar/url-editor-dialog.c:541
 msgid "Edit Location"
-msgstr "Uredi lokaciju"
+msgstr "Izmenite mesto"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:168
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "JIB"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "Spisak opisa"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "Spisak kategorija"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "Spisak komentara"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
-msgstr "Kontakt lista"
+msgstr "Spisak kontakata"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "Početak"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "Kraj"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "Rok"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "postotak završenog"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "Adresa"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "Spisak učesnika"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "Izmenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "Na_predne opcije za CVS format"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "Prvo uključi _zaglavlje"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "Graničnik _vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "Graničnik _zapisa:"
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "_Obavij vrednosti sa:"
 
-#: ../plugins/save-calendar/csv-format.c:638
+#: ../plugins/save-calendar/csv-format.c:627
 msgid "Comma separated values (.csv)"
 msgstr "Vrednosti razdvojene zarezom (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
 msgid "iCalendar (.ics)"
 msgstr "iKalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
-msgstr "Izabrano čuvanje"
+msgstr "Sačuvaj izabrano"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
@@ -20298,31 +19350,31 @@ msgstr "Čuva kalendar ili spisak zadataka na disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:152
+#: ../plugins/save-calendar/rdf-format.c:146
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:387
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:123
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:185
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:340
 msgid "Save the selected calendar to disk"
 msgstr "Sačuvaj izabrani kalendar na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:371
 msgid "Save the selected memo list to disk"
 msgstr "Sačuvaj izabranu belešku na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:402
 msgid "Save the selected task list to disk"
 msgstr "Sačuvaj izabrani spisak zadataka na disk"
 
@@ -20332,276 +19384,31 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
-"Priključak za obrazac nacrta. Možete da koristite promenljive kao što su $ORIG"
-"[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti zamenjene "
-"vrednostima iz e-pošte na koju odgovarate."
+"Priključak za obrazac nacrta. Možete da koristite promenljive kao što su "
+"$ORIG[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti "
+"zamenjene vrednostima iz el. pošte na koju odgovarate."
 
-#: ../plugins/templates/templates.c:1105
+#: ../plugins/templates/templates.c:1113
 msgid "No Title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:1217
+#: ../plugins/templates/templates.c:1225
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../plugins/templates/templates.c:1219
+#: ../plugins/templates/templates.c:1227
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "TNEF Decoder"
-msgstr "Dekoder TNEF"
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Dekodira priloge TNEF (winmail.dat) iz Majkrosoft Autluka."
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-msgid "Inline vCards"
-msgstr "Ugnježdene vKarte"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
-msgid "Show vCards directly in mail messages."
-msgstr "Prikazuje vKarte neposredno u porukama."
-
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
-msgid "Show Full vCard"
-msgstr "Prikaži punu vKartu"
-
-#: ../plugins/vcard-inline/vcard-inline.c:211
-msgid "Show Compact vCard"
-msgstr "Prikaži sažetu vKartu"
-
-#: ../plugins/vcard-inline/vcard-inline.c:272
-msgid "There is one other contact."
-msgstr "Postoji još jedan kontakt."
-
-#: ../plugins/vcard-inline/vcard-inline.c:281
-#, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Postoji još %d kontakt."
-msgstr[1] "Postoje još %d kontakta."
-msgstr[2] "Postoji još %d kontakta."
-msgstr[3] "Postoji još %d kontakt."
-
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "Sačuvaj u adresar"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "WebDAV contacts"
-msgstr "VebDAV kontakti"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "Add WebDAV contacts to Evolution."
-msgstr "Dodajte VebDAV kontakte u Evoluciju."
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-msgid "WebDAV"
-msgstr "VebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:286
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Izbegavaj Ako poklapa (potrebno na Apaču < 2.2.8)"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Spisak putanja fascikli za usklađivanje na disku za rad van mreže"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Default window Y coordinate"
-msgstr "Podrazumevana Y koordinata prozora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "The default Y coordinate for the main window."
-msgstr "Podrazumevana Y koordinata glavnog prozora."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "Default window X coordinate"
-msgstr "Podrazumevana X koordinata prozora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "The default X coordinate for the main window."
-msgstr "Podrazumevana X koordinata glavnog prozora."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "Default window width"
-msgstr "Podrazumevana širina prozora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "The default width for the main window, in pixels."
-msgstr "Podrazumevana širina glavnog prozora, u tačkama."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Default window height"
-msgstr "Podrazumevana visina prozora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "The default height for the main window, in pixels."
-msgstr "Podrazumevana visina prozora za poruku, u tačkama."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Default window state"
-msgstr "Podrazumevano stanje prozora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Whether or not the window should be maximized."
-msgstr "Da li će prozor biti uvećan do kraja."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid "Proxy configuration mode"
-msgstr "Režim podešavanja posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Izaberite način podešavanja posrednika. Podržane vrednosti su: 0 — koristi "
-"sistemske postavke, 1 — bez posrednika, 2 — koristi ručna podešavanja "
-"posrednika i 3 — koristi podešavanja posrednika na adresi."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "HTTP proxy port"
-msgstr "Port HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Port na mašini određen u „/apps/evolution/shell/network_config/http_host“ "
-"kroz koji posredujete."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "HTTP proxy host name"
-msgstr "Ime domaćin HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The machine name to proxy HTTP through."
-msgstr "Naziv mašine za HTTP posredovanje."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "Secure HTTP proxy port"
-msgstr "Port bezbednog HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"Port na mašini određen u „/apps/evolution/shell/network_config/secure_host“ "
-"kroz koji posredujete."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "Secure HTTP proxy host name"
-msgstr "Ime domaćina bezbednog HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy secure HTTP through."
-msgstr "Naziv mašine za bezbedno HTTP posredovanje."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "SOCKS proxy port"
-msgstr "Port SOCKS posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"Port na mašini određen u „/apps/evolution/shell/network_config/socks_host“ "
-"kroz koji posredujete."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "SOCKS proxy host name"
-msgstr "Ime domaćina SOCKS posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The machine name to proxy socks through."
-msgstr "Naziv mašine za socks posredovanje."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Use HTTP proxy"
-msgstr "Koristi HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Omogućuje postavke posrednika kada pristupa HTTP/bezbedan HTTP preko "
-"Interneta."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Authenticate proxy server connections"
-msgstr "Autentifikuj veze preko servera posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Ako je izabrano, povezivanje na posrednika zahteva autentifikaciju. "
-"Korisničko ime se čita iz Gkonf ključa „/apps/evolution/shell/network_config/"
-"authentication_user“, a lozinka ili iz gnomovog priveska ili iz datoteke "
-"lozinki „~/.gnome2_private/Evolution“."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "HTTP proxy username"
-msgstr "Korisničko ime HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr "Korisničko ime za autentifikaciju prilikom korišćenja HTTP posredovanja."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "HTTP proxy password"
-msgstr "Lozinka HTTP posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Lozinka za autentifikaciju prilikom korišćenja HTTP posredovanja."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Non-proxy hosts"
-msgstr "Domaćini bez posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"Ovaj ključ sadrži spisak domaćina koji su direktno povezani, bez korišćenja "
-"posrednika (ukoliko je aktivan). Vrednosti mogu biti domaćini, domeni "
-"(upotrebom džokera poput *.foo.com), IP adrese domaćina (IPv4 i IPv6) i "
-"mrežne adrese sa maskom (nešto kao 192.168.0.0/24)."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Automatic proxy configuration URL"
-msgstr "Automatsko podešavanje posrednika"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "URL that provides proxy configuration values."
-msgstr "Adresa sa vrednostima za podešavanje posrednika."
-
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Pripremam se za rad van mreže..."
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Pripremam se za rad na mreži..."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:437
 msgid "Preparing to quit..."
 msgstr "Pripremam se da izađem..."
 
@@ -20619,7 +19426,7 @@ msgstr "Sačuvaj pretragu"
 #. * "Important Messages", or "Active Appointments".
 #: ../shell/e-shell-searchbar.c:940
 msgid "Sho_w:"
-msgstr "Prika_ži: "
+msgstr "Prika_ži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
@@ -20641,14 +19448,14 @@ msgstr "vKarta (.vcf)"
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:304
 msgid "Saving user interface state"
 msgstr "Čuvam stanje korisničkog sučelja"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:642
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor@prevod.org>\n"
@@ -20656,275 +19463,267 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:653
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:891
 msgid "Categories Editor"
 msgstr "Uređivač kategorija"
 
-#: ../shell/e-shell-window-actions.c:1249
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
-#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1411
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../shell/e-shell-window-actions.c:1437
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1416
+#: ../shell/e-shell-window-actions.c:1430
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Open the Evolution User Guide"
 msgstr "Otvorite korisničko uputstvo Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1486
-msgid "_Forget Passwords"
-msgstr "Zaboravi _lozinke"
-
-#: ../shell/e-shell-window-actions.c:1488
-msgid "Forget all remembered passwords"
-msgstr "Zaboravite sve zapamćene lozinke"
-
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1465
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Import data from other programs"
 msgstr "Uvezite podatke iz drugih programa"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1472
 msgid "New _Window"
-msgstr "Nov p_rozor"
+msgstr "Novi _prozor"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Create a new window displaying this view"
 msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Available Cate_gories"
 msgstr "Dostupne _kategorije"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Manage available categories"
 msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Quick Reference"
 msgstr "_Kratak podsetnik"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Show Evolution's shortcut keys"
 msgstr "Prikažite prečice tastature Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Exit the program"
 msgstr "Izađite iz programa"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Construct a more advanced search"
 msgstr "Obrazujte napredniju pretragu"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Clear the current search parameters"
 msgstr "Očistite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi sačuvane pretrage..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Manage your saved searches"
 msgstr "Upravljajte vašim sačuvanim pretragama"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Execute the current search parameters"
 msgstr "Izvršite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Save Search..."
 msgstr "_Sačuvaj pretragu..."
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Save the current search parameters"
 msgstr "Sačuvajte parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Submit _Bug Report..."
 msgstr "Pošalji izveštaj o _grešci..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošaljite izveštaj o grešci Bubaždajinim pomoćnikom"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
-msgstr "Ra_d van mreže"
+msgstr "Rad _van mreže"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Put Evolution into offline mode"
 msgstr "Postavite Evoluciju u rad van mreže"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Put Evolution into online mode"
 msgstr "Postavite Evoluciju u rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Lay_out"
 msgstr "_Raspored"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1614
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Search"
-msgstr "_Pretraži"
+msgstr "Pre_traži"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Switcher Appearance"
-msgstr "Izgled _prebacivača"
+msgstr "_Izgled prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../shell/e-shell-window-actions.c:1699
+#: ../shell/e-shell-window-actions.c:1671
 msgid "Show Side _Bar"
 msgstr "Prikaži _bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show the side bar"
 msgstr "Prikažite bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show _Buttons"
 msgstr "Prikaži _dugmad"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show the switcher buttons"
 msgstr "Prikažite dugmad prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show _Status Bar"
 msgstr "Prikaži traku _stanja"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the status bar"
 msgstr "Prikažite traku stanja"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Tool Bar"
 msgstr "Prikaži traku _alata"
 
-#: ../shell/e-shell-window-actions.c:1725
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the tool bar"
 msgstr "Prikažite traku alata"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1719
 msgid "_Icons Only"
 msgstr "Samo _ikonice"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Display window buttons with icons only"
 msgstr "Prikažite dugmad prozora samo sa ikonicama"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1726
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Display window buttons with text only"
 msgstr "Prikažite dugmad prozora samo sa tekstom"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Icons _and Text"
 msgstr "Ikonice _i tekst"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Display window buttons with icons and text"
 msgstr "Prikažite dugmad prozora sa ikonicama i tekstom"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Prikažite dugmad prozora koristeći podešavanja trake alata radne površi"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Create or edit views"
 msgstr "Napravite ili izmenite preglede"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Save current custom view"
 msgstr "Sačuvajte trenutni korisnički pregled"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1766
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../shell/e-shell-window-actions.c:1806
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../shell/e-shell-window-actions.c:1816
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Change the page settings for your current printer"
 msgstr "Izmenite postavke stranice za trenutni štampač"
 
-#: ../shell/e-shell-window-actions.c:2206
+#: ../shell/e-shell-window-actions.c:2178
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../shell/e-shell-window-actions.c:2327
+#: ../shell/e-shell-window-actions.c:2299
 #, c-format
 msgid "Select view: %s"
 msgstr "Izaberi pregled: %s"
 
-#: ../shell/e-shell-window-actions.c:2428
+#: ../shell/e-shell-window-actions.c:2400
 msgid "Execute these search parameters"
 msgstr "Izvršite ove parametre pretrage"
 
@@ -20933,13 +19732,13 @@ msgid "New"
 msgstr "Novo"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:585
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Evolucija"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:186
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20974,7 +19773,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaš doprinos!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:210
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20982,13 +19781,13 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reći"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:310
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20996,48 +19795,48 @@ msgstr ""
 "Pokreće Evoluciju prikazujući određene komponente. Dostupne opcije su: "
 "„mail“, „calendar“, „contacts“, „tasks“ i „memos“"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "Zanemari dostupnost mreže"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "Počni u „ekspresnom“ režimu"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:326
 msgid "Disable loading of any plugins."
 msgstr "Isključi učitavanje svih dodataka."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:328
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Isključi okno za pregled pošte, kontakta i zadataka."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:332
 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
+#: ../shell/main.c:334
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:510 ../shell/main.c:518
+#: ../shell/main.c:508 ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
-msgstr "— Evolucija rukovodilac ličnim podatacima i klijent e-pošte"
+msgstr "— Evolucija rukovodilac ličnim podatacima i klijent el. pošte"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:581
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21046,7 +19845,7 @@ msgstr ""
 "%s: „--online“ i „--offline“ se ne mogu koristiti zajedno.\n"
 "  Pokrenite „%s --help“ za više podataka.\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:587
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21094,22 +19893,6 @@ msgstr ""
 "rešenje možete prvo da pokušate da nadogradite na Evoluciju 2, a zatim na "
 "Evoluciju 3."
 
-#: ../shell/shell.error.xml.h:11
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Sigurno želite da sve zapamćene lozinke budu zaboravljene?"
-
-#: ../shell/shell.error.xml.h:12
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Zaboravljanje lozinki će očistiti sve zapamćene lozinke. Ponovo ćete biti "
-"upitani kada sledeći put budu bile potrebne."
-
-#: ../shell/shell.error.xml.h:13
-msgid "_Forget"
-msgstr "Za_boravi"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -21131,12 +19914,12 @@ msgstr "Napravite novi probni izvor"
 #: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr "Nije ispravna .desktop datoteka"
+msgstr "Ovo nije ispravna „.desktop“ datoteka"
 
 #: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "Neprepoznatljiva verzija datoteke desktop „%s“"
+msgstr "Neprepoznato izdanje datoteke radne površi „%s“"
 
 #: ../smclient/eggdesktopfile.c:959
 #, c-format
@@ -21146,12 +19929,12 @@ msgstr "Pokrećem %s"
 #: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr "Aplikacija ne prihvata dokumenta na liniji naredbi"
+msgstr "Program ne prihvata dokumente iz linije naredbi"
 
 #: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "Neprepoznatljiva opcija učitavanja: %d"
+msgstr "Nepoznata opcija pokretanja: %d"
 
 #: ../smclient/eggdesktopfile.c:1370
 #, c-format
@@ -21165,11 +19948,11 @@ msgstr "Nije stavka za pokretanje"
 
 #: ../smclient/eggsmclient.c:229
 msgid "Disable connection to session manager"
-msgstr "Onemogući povezivanje na upravnika sesije"
+msgstr "Isključuje vezu sa upravnikom sesije"
 
 #: ../smclient/eggsmclient.c:232
 msgid "Specify file containing saved configuration"
-msgstr "Odredi datoteku sa sačuvanim podešavanjem"
+msgstr "Navodi datoteku koja sadrži sačuvana podešavanja"
 
 #: ../smclient/eggsmclient.c:232
 msgid "FILE"
@@ -21177,7 +19960,7 @@ msgstr "DATOTEKA"
 
 #: ../smclient/eggsmclient.c:235
 msgid "Specify session management ID"
-msgstr "Određuje IB sesije upravljanja"
+msgstr "Navodi IB upravnika sesije"
 
 #: ../smclient/eggsmclient.c:235
 msgid "ID"
@@ -21185,11 +19968,11 @@ msgstr "IB"
 
 #: ../smclient/eggsmclient.c:256
 msgid "Session management options:"
-msgstr "Opcije sesije upravljanja:"
+msgstr "Mogućnosti upravljanja sesijom:"
 
 #: ../smclient/eggsmclient.c:257
 msgid "Show session management options"
-msgstr "Prikazuje opcije upravljanja sesijom"
+msgstr "Prikazuje mogućnosti upravljanja sesijom"
 
 #: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
@@ -21218,7 +20001,7 @@ msgstr "Izdato je organizacionoj jedinici"
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:543
+#: ../smime/lib/e-cert.c:542
 msgid "Serial Number"
 msgstr "Serijski broj"
 
@@ -21232,7 +20015,7 @@ msgstr "Namene"
 #: ../smime/gui/certificate-manager.c:102
 #: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
 msgid "Issued By"
-msgstr "Izdato od"
+msgstr "Izdavač"
 
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
@@ -21273,31 +20056,31 @@ msgstr "MD5 Otisak"
 #: ../smime/gui/certificate-manager.c:97
 #: ../smime/gui/certificate-manager.c:117
 msgid "Email Address"
-msgstr "Adresa e‑pošte"
+msgstr "Adresa el. pošte"
 
-#: ../smime/gui/certificate-manager.c:584
+#: ../smime/gui/certificate-manager.c:589
 msgid "Select a certificate to import..."
-msgstr "Izaberite sertifikat za uvoz..."
+msgstr "Izaberite uverenje za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:602
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../smime/gui/certificate-manager.c:632
+#: ../smime/gui/certificate-manager.c:637
 msgid "Failed to import certificate"
 msgstr "Nisam uspeo da uvezem uverenje"
 
-#: ../smime/gui/certificate-manager.c:1006
+#: ../smime/gui/certificate-manager.c:1013
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:1023
+#: ../smime/gui/certificate-manager.c:1030
 msgid "All email certificate files"
 msgstr "Sve datoteke uverenja pošte"
 
-#: ../smime/gui/certificate-manager.c:1040
+#: ../smime/gui/certificate-manager.c:1047
 msgid "All CA certificate files"
-msgstr "Sve datoteke CA sertifikata"
+msgstr "Sve datoteke CA uverenja"
 
 #: ../smime/gui/certificate-viewer.c:349
 #, c-format
@@ -21359,21 +20142,21 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Izaberite uverenje"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Uverenje SSL klijenta"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Uverenje SSL servera"
 
 #: ../smime/gui/smime-ui.ui.h:5
 msgid "Email Signer Certificate"
-msgstr "Uverenje potpisnika e-poruke"
+msgstr "Uverenje potpisnika el. poruke"
 
 #: ../smime/gui/smime-ui.ui.h:6
 msgid "Email Recipient Certificate"
-msgstr "Uverenje primaoca e-poruke"
+msgstr "Uverenje primaoca el. poruke"
 
 #: ../smime/gui/smime-ui.ui.h:7
 msgid "This certificate has been verified for the following uses:"
@@ -21427,6 +20210,10 @@ msgstr "Polja uverenja"
 msgid "Field Value"
 msgstr "Vrednost polja"
 
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "Pojedinosti"
+
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Posedujete uverenja ovih organizacija koja vas određuju:"
@@ -21489,7 +20276,7 @@ msgstr ""
 "Pre verovanja ovom izdavaocu uverenja, prvo pregledajte njegovo uverenje, "
 "politiku i procedure (ako su dostupni)."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Uverenje"
 
@@ -21499,7 +20286,7 @@ msgstr "Detalji uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:46
 msgid "Email Certificate Trust Settings"
-msgstr "Podešavanja poverenja u uverenja e-pošte"
+msgstr "Podešavanja poverenja u uverenja el. pošte"
 
 #: ../smime/gui/smime-ui.ui.h:47
 msgid "Trust the authenticity of this certificate"
@@ -21513,153 +20300,153 @@ msgstr "Ne veruj u verodostojnost ovog uverenja"
 msgid "_Edit CA Trust"
 msgstr "_Uredi CA poverenje"
 
-#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:390
 msgid "Sign"
 msgstr "Potpiši"
 
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:391
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../smime/lib/e-cert.c:504
+#: ../smime/lib/e-cert.c:503
 msgid "Version"
 msgstr "Izdanje"
 
-#: ../smime/lib/e-cert.c:519
+#: ../smime/lib/e-cert.c:518
 msgid "Version 1"
 msgstr "Izdanje 1"
 
-#: ../smime/lib/e-cert.c:522
+#: ../smime/lib/e-cert.c:521
 msgid "Version 2"
 msgstr "Izdanje 2"
 
-#: ../smime/lib/e-cert.c:525
+#: ../smime/lib/e-cert.c:524
 msgid "Version 3"
 msgstr "Izdanje 3"
 
-#: ../smime/lib/e-cert.c:608
+#: ../smime/lib/e-cert.c:607
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:611
+#: ../smime/lib/e-cert.c:610
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:614
+#: ../smime/lib/e-cert.c:613
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA šifrovanje"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključa uverenja"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
-msgstr "Tip Netskejp uverenja"
+msgstr "Vrsta Netskejp uverenja"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Određivač ključa izdavaoca uverenja"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Određivač predmeta (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Određivač algoritma"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom ključu subjekta"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog ključa subjekta"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Javni ključ subjekta"
 
-#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
 msgid "Error: Unable to process extension"
 msgstr "Greška: ne mogu da obradim proširenje"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Potpisnik predmeta"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Izdavač SSL uverenja"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
-msgstr "Izdavač uverenja e-pošte"
+msgstr "Izdavač uverenja el. pošte"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:851
 msgid "Signing"
 msgstr "Potpisivanje"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:855
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:859
 msgid "Key Encipherment"
 msgstr "Zamućivanje ključa"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:863
 msgid "Data Encipherment"
 msgstr "Zamućivanje podataka"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:867
 msgid "Key Agreement"
 msgstr "Saglasnost ključa"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:871
 msgid "Certificate Signer"
 msgstr "Potpisnik uverenja"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:875
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:924
 msgid "Critical"
 msgstr "Kritično"
 
-#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
+#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
 msgid "Not Critical"
 msgstr "Nije kritično"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:950
 msgid "Extensions"
 msgstr "Proširenja"
 
@@ -21671,44 +20458,44 @@ msgstr "Proširenja"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1030
+#: ../smime/lib/e-cert.c:1029
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa uverenja"
 
-#: ../smime/lib/e-cert.c:1095
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "Izdavač"
 
-#: ../smime/lib/e-cert.c:1150
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavača"
 
-#: ../smime/lib/e-cert.c:1169
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa uverenja"
 
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:860
 msgid "Certificate already exists"
 msgstr "Uverenje već postoji"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "Uveženo uverenje"
 
@@ -21793,7 +20580,7 @@ msgstr "Sa _stanjem"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
 msgid "UTC"
-msgstr "KUV (UTC)"
+msgstr "KUV"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
@@ -21840,7 +20627,7 @@ msgstr "Odredi preglede za „%s“"
 msgid "Table"
 msgstr "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
 msgid "Save Current View"
 msgstr "Sačuvaj trenutni pregled"
 
@@ -21858,27 +20645,27 @@ msgstr "Odredi novi pregled"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
-msgstr "Ime novog pregleda:"
+msgstr "Naziv novog pregleda:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of view:"
-msgstr "Tip pregleda:"
+msgstr "Vrsta pregleda:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of View"
-msgstr "Tip pregleda"
+msgstr "Vrsta pregleda"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
+#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:317
 msgid "%d %B %Y"
 msgstr "%d %B %Y."
 
-#: ../widgets/misc/ea-calendar-item.c:318
+#: ../widgets/misc/ea-calendar-item.c:320
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendar: od %s do %s"
 
-#: ../widgets/misc/ea-calendar-item.c:354
+#: ../widgets/misc/ea-calendar-item.c:356
 msgid "evolution calendar item"
 msgstr "stavka kalendara evolucije"
 
@@ -21886,6 +20673,16 @@ msgstr "stavka kalendara evolucije"
 msgid "Close this message"
 msgstr "Zatvorite ovu poruku"
 
+#: ../widgets/misc/e-attachment-bar.c:658
+#: ../widgets/misc/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Pregled ikonicama"
+
+#: ../widgets/misc/e-attachment-bar.c:660
+#: ../widgets/misc/e-attachment-paned.c:705
+msgid "List View"
+msgstr "Pregled spiskom"
+
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
@@ -21895,50 +20692,50 @@ msgid "Attached message"
 msgstr "Priložena poruka"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
 msgid "A load operation is already in progress"
 msgstr "Operacija učitavanja je već u toku"
 
-#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
 msgid "A save operation is already in progress"
 msgstr "Operacija čuvanja je već u toku"
 
-#: ../widgets/misc/e-attachment.c:1954
+#: ../widgets/misc/e-attachment.c:1989
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Ne mogu da učitam „%s“"
 
-#: ../widgets/misc/e-attachment.c:1957
+#: ../widgets/misc/e-attachment.c:1992
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ne mogu da učitam prilog"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2265
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Ne mogu da otvorim „%s“"
 
-#: ../widgets/misc/e-attachment.c:2233
+#: ../widgets/misc/e-attachment.c:2268
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ne mogu da otvorim prilog"
 
-#: ../widgets/misc/e-attachment.c:2667
+#: ../widgets/misc/e-attachment.c:2702
 msgid "Attachment contents not loaded"
 msgstr "Sadržaj priloga nije učitan"
 
 # * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2743
+#: ../widgets/misc/e-attachment.c:2778
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Ne mogu da sačuvam „%s“"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2781
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ne mogu da sačuvam prilog"
@@ -21947,9 +20744,14 @@ msgstr "Ne mogu da sačuvam prilog"
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "_Naziv datoteke:"
+
 #: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
-msgstr "MIME tip:"
+msgstr "MIME vrsta:"
 
 #: ../widgets/misc/e-attachment-dialog.c:376
 #: ../widgets/misc/e-attachment-store.c:442
@@ -21983,12 +20785,12 @@ msgstr "Pošaljite izabrane priloge negde"
 #: ../widgets/misc/e-attachment-icon-view.c:166
 #: ../widgets/misc/e-attachment-tree-view.c:549
 msgid "Loading"
-msgstr "Učitavanje"
+msgstr "Učitavam"
 
 #: ../widgets/misc/e-attachment-icon-view.c:178
 #: ../widgets/misc/e-attachment-tree-view.c:561
 msgid "Saving"
-msgstr "Čuvanje"
+msgstr "Čuvam"
 
 #: ../widgets/misc/e-attachment-paned.c:104
 msgid "Hide Attachment _Bar"
@@ -22053,20 +20855,90 @@ msgstr "Otvori programom „%s“"
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u „%s“"
 
+#: ../widgets/misc/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Označava kao podrazumevan adresar"
+
+#: ../widgets/misc/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Sam dopunjava ovim adresarom"
+
+#: ../widgets/misc/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
+
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:387
+#: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
 msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:187
+msgid "Previous month"
+msgstr "Prethodni mesec"
+
+#: ../widgets/misc/e-calendar.c:211
+msgid "Next month"
+msgstr "Sledeći mesec"
+
+#: ../widgets/misc/e-calendar.c:233
+msgid "Previous year"
+msgstr "Prethodna godina"
+
+#: ../widgets/misc/e-calendar.c:254
+msgid "Next year"
+msgstr "Sledeća godina"
+
+#: ../widgets/misc/e-calendar.c:278
 msgid "Month Calendar"
 msgstr "Mesečni kalendar"
 
+#. This is a strftime() format. %B = Month name.
+#: ../widgets/misc/e-calendar-item.c:1283
+#: ../widgets/misc/e-calendar-item.c:2136
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1285
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1269
+#: ../widgets/misc/e-calendar-item.c:1322
+msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
 
+#: ../widgets/misc/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Označava kao osnovni kalendar"
+
+#: ../widgets/misc/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Označava kao osnovni spisak zadataka"
+
+#: ../widgets/misc/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Označava kao osnovni spisak beleški"
+
+#: ../widgets/misc/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Boja:"
+
+#: ../widgets/misc/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
+
+#: ../widgets/misc/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
+
+#: ../widgets/misc/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
+
 #: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "Kodna strana"
@@ -22079,7 +20951,7 @@ msgstr "Izaberite kodnu stranu za korišćenje"
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../widgets/misc/e-contact-map-window.c:355
+#: ../widgets/misc/e-contact-map-window.c:356
 msgid "Contacts Map"
 msgstr "Karta kontakata"
 
@@ -22116,7 +20988,7 @@ msgstr "_Danas"
 #. * is not permitted.
 #: ../widgets/misc/e-dateedit.c:682
 msgid "_None"
-msgstr "Ništ_a"
+msgstr "_Ništa"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -22125,16 +20997,16 @@ msgstr "Ništ_a"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
+#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "Ništa"
 
-#: ../widgets/misc/e-dateedit.c:1821
+#: ../widgets/misc/e-dateedit.c:1824
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../widgets/misc/e-dateedit.c:1865
+#: ../widgets/misc/e-dateedit.c:1868
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
@@ -22153,7 +21025,7 @@ msgstr "Izaberite datoteku"
 #: ../widgets/misc/e-import-assistant.c:297
 #: ../widgets/misc/e-import-assistant.c:472
 msgid "File _type:"
-msgstr "_Tip datoteke:"
+msgstr "_Vrsta datoteke:"
 
 #: ../widgets/misc/e-import-assistant.c:340
 #: ../widgets/misc/e-import-assistant.c:920
@@ -22225,7 +21097,7 @@ msgstr ""
 
 #: ../widgets/misc/e-import-assistant.c:1326
 msgid "Importer Type"
-msgstr "Tip uvoznika"
+msgstr "Vrsta uvoznika"
 
 #: ../widgets/misc/e-import-assistant.c:1336
 msgid "Select Information to Import"
@@ -22237,7 +21109,57 @@ msgstr "Izaberite datoteku"
 
 #: ../widgets/misc/e-import-assistant.c:1362
 msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju. "
+msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
+
+#: ../widgets/misc/e-mail-signature-combo-box.c:327
+msgid "Autogenerated"
+msgstr "Automatski sastavljeno"
+
+#: ../widgets/misc/e-mail-signature-editor.c:292
+msgid "_Save and Close"
+msgstr "_Sačuvaj i zatvori"
+
+#: ../widgets/misc/e-mail-signature-editor.c:506
+msgid "Edit Signature"
+msgstr "Uredi potpis"
+
+#: ../widgets/misc/e-mail-signature-editor.c:526
+msgid "_Signature Name:"
+msgstr "Naziv _potpisa:"
+
+#: ../widgets/misc/e-mail-signature-editor.c:572
+msgid "Unnamed"
+msgstr "Bez imena"
+
+#: ../widgets/misc/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Dodaj sk_riptu"
+
+#: ../widgets/misc/e-mail-signature-manager.c:421
+msgid "Add Signature Script"
+msgstr "Dodaj skriptu za potpis"
+
+#: ../widgets/misc/e-mail-signature-manager.c:491
+msgid "Edit Signature Script"
+msgstr "Uredi skriptu potpisa"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"Izlaz ove skripte će biti korišćen kao\n"
+"potpis. Naziv koji ste dali će biti korišćen\n"
+"samo za prikaz."
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "S_kripta:"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "Datoteka skripte mora biti izvršna."
 
 #: ../widgets/misc/e-map.c:886
 msgid "World Map"
@@ -22254,12 +21176,12 @@ msgstr ""
 #: ../widgets/misc/e-online-button.c:31
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
-"Evolucija je trenutno na mreži. Kliknite na ovo dugme za rad van mreže."
+"Evolucija je trenutno na mreži.  Kliknite na ovo dugme za rad van mreže."
 
 #: ../widgets/misc/e-online-button.c:34
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
-"Evolucija trenutno nije na mreži. Kliknite na ovo dugme da se povežete."
+"Evolucija trenutno nije na mreži.  Kliknite na ovo dugme da se povežete."
 
 #: ../widgets/misc/e-online-button.c:37
 msgid "Evolution is currently offline because the network is unavailable."
@@ -22270,48 +21192,48 @@ msgid "Evolution Preferences"
 msgstr "Podešavanja Evolucije"
 
 # bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "Poklapanja: %d"
+msgid "Matches: %u"
+msgstr "Poklapanja: %u"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:527
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:535
 msgid "Fin_d:"
 msgstr "Pro_nađi:"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../widgets/misc/e-search-bar.c:547
 msgid "Clear the search"
 msgstr "Očisti pretragu"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:571
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nađi prethodno pojavljivanje izraza"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "_Sledeće"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "Nađi sledeće pojavljivanje izraza"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
-msgstr "Po_klopi veličinu slova"
+msgstr "_Uporedi veličinu slova"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
 
@@ -22321,7 +21243,7 @@ msgstr "Kada je obri_sano:"
 
 #: ../widgets/misc/e-send-options.ui.h:3
 msgid "Standard"
-msgstr "Standard"
+msgstr "Obično"
 
 #: ../widgets/misc/e-send-options.ui.h:6
 msgid "Proprietary"
@@ -22455,106 +21377,136 @@ msgstr "Povratno obaveštenje"
 msgid "Sta_tus Tracking"
 msgstr "Praćenje sta_tusa"
 
-#: ../widgets/misc/e-signature-editor.c:142
-#: ../widgets/misc/e-signature-editor.c:567
-#: ../widgets/misc/e-signature-manager.c:376
-#: ../widgets/misc/e-signature-script-dialog.c:223
-msgid "Unnamed"
-msgstr "Bez imena"
+#: ../widgets/misc/e-source-config.c:669 ../widgets/misc/e-source-config.c:673
+msgid "Type:"
+msgstr "Vrsta:"
 
-#: ../widgets/misc/e-signature-editor.c:218
-msgid "_Save and Close"
-msgstr "_Sačuvaj i zatvori"
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../widgets/misc/e-source-config.c:1276
+msgid "Refresh every"
+msgstr "Osveži na svakih"
 
-#: ../widgets/misc/e-signature-editor.c:434
-msgid "Edit Signature"
-msgstr "Uredi potpis"
+#: ../widgets/misc/e-source-config.c:1306
+#: ../widgets/misc/e-source-config.c:1334
+msgid "Use a secure connection"
+msgstr "Koristi bezbednu vezu"
 
-#: ../widgets/misc/e-signature-editor.c:449
-msgid "_Signature Name:"
-msgstr "Naziv _potpisa:"
+#: ../widgets/misc/e-source-config.c:1348
+msgid "Ignore invalid SSL certificate"
+msgstr "Zanemari neispravno SSL uverenje"
 
-#: ../widgets/misc/e-signature-manager.c:321
-msgid "Add Signature Script"
-msgstr "Dodaj skriptu za potpis"
+#: ../widgets/misc/e-source-config.c:1385
+msgid "User"
+msgstr "Korisnik"
 
-#: ../widgets/misc/e-signature-manager.c:386
-msgid "Edit Signature Script"
-msgstr "Uredi skriptu potpisa"
+#. no suggestions. Put something in the menu anyway...
+#: ../widgets/misc/e-spell-entry.c:351
+msgid "(no suggestions)"
+msgstr "(nema predloga)"
 
-#: ../widgets/misc/e-signature-manager.c:605
-msgid "Add _Script"
-msgstr "Dodaj sk_riptu"
+#: ../widgets/misc/e-spell-entry.c:375
+msgid "More..."
+msgstr "Dalje..."
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"Izlaz ove skripte će biti korišćen kao\n"
-"potpis. Ime koje ste dali će biti korišćeno\n"
-"samo za prikaz."
+#. + Add to Dictionary
+#: ../widgets/misc/e-spell-entry.c:444
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "Dodaj „%s“ u rečnik"
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
-msgid "S_cript:"
-msgstr "S_kripta:"
+#. - Ignore All
+#: ../widgets/misc/e-spell-entry.c:487
+msgid "Ignore All"
+msgstr "Zanemari sve"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
-msgid "Script file must be executable."
-msgstr "Datoteka skripte mora biti izvršna."
+#: ../widgets/misc/e-spell-entry.c:513
+msgid "Spelling Suggestions"
+msgstr "Predlozi pravopisa"
 
 #: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "Kliknite ovde da posetite adresu"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:278 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:280 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "Copy the link to the clipboard"
 msgstr "Umnožava vezu u spisak isečaka"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:288 ../widgets/misc/e-web-view-gtkhtml.c:417
 msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u pregledaču"
+msgstr "_Otvori vezu u pregledniku"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:290 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "Open the link in a web browser"
 msgstr "Otvori vezu u veb pretraživaču"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:298 ../widgets/misc/e-web-view-gtkhtml.c:427
 msgid "_Copy Email Address"
-msgstr "_Umnoži adresu e-pošte"
+msgstr "_Umnoži adresu el. pošte"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:315 ../widgets/misc/e-web-view-gtkhtml.c:444
 msgid "_Copy Image"
 msgstr "_Umnoži sliku"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../widgets/misc/e-web-view.c:317 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "Copy the image to the clipboard"
 msgstr "Umnožite sliku u ostavu"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:337 ../widgets/misc/e-web-view.c:1425
+#: ../widgets/misc/e-web-view-gtkhtml.c:466
+#: ../widgets/misc/e-web-view-gtkhtml.c:1311
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1089 ../widgets/misc/e-web-view.c:1091
+#: ../widgets/misc/e-web-view.c:1093 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view-gtkhtml.c:977
+#: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1095 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
+#: ../widgets/misc/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Da li želite da sačuvate izmene?"
+
+#: ../widgets/misc/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
+
+#: ../widgets/misc/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Odbaci izmene"
+
+#: ../widgets/misc/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Prazan potpis"
+
+#: ../widgets/misc/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
+
+#: ../widgets/misc/widgets.error.xml.h:6
+msgid "Could not load signature."
+msgstr "Ne mogu da učitam potpis."
+
+#: ../widgets/misc/widgets.error.xml.h:7
+msgid "Could not save signature."
+msgstr "Ne mogu da sačuvam potpis."
+
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "iskačuća lista"
@@ -22588,7 +21540,7 @@ msgstr "Vreme mora biti u formatu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost procenta mora biti između 0 i 100"
 
-#: ../widgets/table/e-table-click-to-add.c:610
+#: ../widgets/table/e-table-click-to-add.c:609
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
@@ -22701,7 +21653,7 @@ msgstr "_Grupiši po..."
 msgid "_Fields Shown..."
 msgstr "Prikazana _polja..."
 
-#: ../widgets/table/e-table-field-chooser.c:153
+#: ../widgets/table/e-table-field-chooser.c:152
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22720,7 +21672,7 @@ msgstr "Dodaj kolonu"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:361
+#: ../widgets/table/e-table-group-container.c:360
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22735,7 +21687,7 @@ msgstr[3] "%s: %s (jedna stavka)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:373
+#: ../widgets/table/e-table-group-container.c:372
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -22799,7 +21751,7 @@ msgstr "_Poređaj po"
 #. Custom
 #: ../widgets/table/e-table-header-item.c:1709
 msgid "_Custom"
-msgstr "_Prilagođeno"
+msgstr "_Proizvoljno"
 
 #: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
@@ -22833,1419 +21785,10 @@ msgstr "klik"
 msgid "sort"
 msgstr "razvrstavanje"
 
-#: ../widgets/text/e-text.c:2338
+#: ../widgets/text/e-text.c:2074
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../widgets/text/e-text.c:2351
+#: ../widgets/text/e-text.c:2087
 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 :"
-
-# %B = full month name, %d = month day, %Y = full year.
-#~ msgid "%A, %B %d, %Y"
-#~ msgstr "%A, %d %B , %Y."
-
-# name, %m = month number, %d = month day, %Y = full year.
-# This is a strftime() format string %a = abbreviated weekday name,
-# %m = month number, %d = month day, %Y = full year.
-# strptime format of a weekday and a date.
-# strftime format of a weekday and a date.
-#~ msgid "%a %m/%d/%Y"
-#~ msgstr "%a %d. %m. %Y."
-
-# %d = month day, %Y = full year.
-# strptime format of a weekday and a date.
-# This is the preferred date format for the locale.
-# This is a strftime() format for a short date. %m = month,
-# %d = day of month, %Y = year (all digits).
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d. %m. %Y."
-
-#~ msgid "GConf error: %s"
-#~ msgstr "Gkonf greška: %s"
-
-#~ msgid "All further errors shown only on terminal."
-#~ msgstr "Sve greške se ubuduće prikazuju samo u terminalu."
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#~ msgctxt "mail-receiving"
-#~ msgid "None"
-#~ msgstr "Ništa"
-
-#~ msgid ""
-#~ "Please enter a descriptive name for this account below.\n"
-#~ "This name will be used for display purposes only."
-#~ msgstr ""
-#~ "Unesite opisno ime za ovaj nalog.\n"
-#~ "Ovo ime će biti korišćeno samo za prikaz."
-
-#~ msgid "Migrating..."
-#~ msgstr "Prenosim..."
-
-#~ msgid "Migration"
-#~ msgstr "Prelazak"
-
-#~ msgid "Migrating '%s':"
-#~ msgstr "Prenosim „%s“:"
-
-#~ msgid "Migrating Folders"
-#~ msgstr "Prenošenje fascikli"
-
-#~ msgid ""
-#~ "The summary format of the Evolution mailbox folders has been moved to "
-#~ "SQLite since Evolution 2.24.\n"
-#~ "\n"
-#~ "Please be patient while Evolution migrates your folders..."
-#~ msgstr ""
-#~ "Format sažetka fascikli pošte prebačen je na SKuLajt još od Evolucije "
-#~ "2.24.\n"
-#~ "\n"
-#~ "Budite strpljivi dok Evolucija prenosi fascikle..."
-
-#~ msgid ""
-#~ "A read receipt notification has been requested for \"{1}\". Send the "
-#~ "receipt notification to {0}?"
-#~ msgstr "Povratnica je zatražena za „{1}“. Da pošaljem povratnicu za {0}?"
-
-#~ msgid "Read receipt requested."
-#~ msgstr "Pročitajte zatražene povratnice."
-
-# bug(slobo): verovatno izveštaj o dostavi
-#~ msgid "_Send Receipt"
-#~ msgstr "Pošalji _povratnicu"
-
-#~ msgid "Import cancelled. Click \"Forward\" to continue."
-#~ msgstr "Uvoženje je otkazano. Kliknite „Napred“ da nastavite."
-
-#~ msgid "Import complete. Click \"Forward\" to continue."
-#~ msgstr "Uvoženje je obavljeno. Kliknite „Napred“ da nastavite."
-
-#~ msgid "Send the debugging output of all components to a file."
-#~ msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
-
-#~ msgid "Protocol"
-#~ msgstr "Protokol"
-
-#~ msgid "Local Folders"
-#~ msgstr "Lokalne fascikle"
-
-#~ msgid "Alarms"
-#~ msgstr "Alarmi"
-
-#~ msgid "Save as iCalendar..."
-#~ msgstr "_Sačuvaj kao iKalendar..."
-
-#~ msgid "Edit Alarm"
-#~ msgstr "Navij sat"
-
-#~ msgid "Add Alarm"
-#~ msgstr "Dodaj alarm"
-
-#~ msgid "Alarm"
-#~ msgstr "Alarm"
-
-#~ msgid "_Alarms"
-#~ msgstr "Ala_rmi"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#~ msgctxt "cal-alarms"
-#~ msgid "None"
-#~ msgstr "Ništa"
-
-#~ msgid "Custom Alarm:"
-#~ msgstr "Proizvoljan alarm:"
-
-#~ msgid "_Alarm"
-#~ msgstr "_Alarm"
-
-#~ msgid "_Group:"
-#~ msgstr "_Grupa:"
-
-#~ msgid "It has alarms."
-#~ msgstr "Ima alarme."
-
-#~ msgctxt "iCalImp"
-#~ msgid "has alarms"
-#~ msgstr "ima alarme"
-
-#~ msgid "Please select a folder from the current account."
-#~ msgstr "Izaberite fasciklu iz tekućeg naloga."
-
-#~ msgid "Alarm programs"
-#~ msgstr "Programi za alarm"
-
-#~ msgid "Evolution _FAQ"
-#~ msgstr "Pomo_ć za Evoluciju"
-
-#~ msgid "Open the Frequently Asked Questions webpage"
-#~ msgstr "Otvorite veb stranicu sa često postavljanim pitanjima"
-
-#~ msgid "Click here to close the current window"
-#~ msgstr "Pritisnite ovde da zatvorite tekući prozor"
-
-#~ msgid "Click here to view help available"
-#~ msgstr "Pritisnite ovde za dostupnu pomoć"
-
-#~ msgid "Click here to save the current window"
-#~ msgstr "Pritisnite ovde da sačuvate tekući prozor"
-
-#~ msgid "Click here to attach a file"
-#~ msgstr "Pritisnite ovde da priložite dokument"
-
-#~ msgid "_Default junk plugin:"
-#~ msgstr "_Podrazumevani priključak za đubre:"
-
-#~ msgid "_Use Secure Connection:"
-#~ msgstr "_Koristi sigurnu vezu:"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#~ msgctxt "mail-junk-hook"
-#~ msgid "None"
-#~ msgstr "Ništa"
-
-#~ msgid "%s plugin is available and the binary is installed."
-#~ msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
-
-#~ msgid ""
-#~ "%s plugin is not available. Please check whether the package is installed."
-#~ msgstr "Dodatak %s nije dostupan. Proverite da li je paket instaliran."
-
-#~ msgid "No junk plugin available"
-#~ msgstr "Nema dostupnog priključka za đubre"
-
-#~ msgid "Bogofilter is not available. Please install it first."
-#~ msgstr "Bogofilter nije dostupan. Prvo ga instalirajte."
-
-#~ msgid "Error occurred while spawning %s: %s."
-#~ msgstr "Došlo je do greške u pripremi %s: %s."
-
-#~ msgid "Bogofilter child process does not respond, killing..."
-#~ msgstr "Zavisan proces Bogofiltera ne reaguje, gasim..."
-
-#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
-#~ msgstr "Čekanje na zavisan proces Bogofiltera ometeno, prekidam..."
-
-#~ msgid "Pipe to Bogofilter failed, error code: %d."
-#~ msgstr "Cev ka Bogofilteru je pukla, oznaka greške: %d."
-
-#~ msgid "Bogofilter Junk Filter"
-#~ msgstr "Filter neželjene pošte Bogofilter"
-
-#~ msgid "Filter junk messages using Bogofilter."
-#~ msgstr "Filtrira neželjenu poštu korišćenjem Bogofiltera."
-
-#~ msgid "Use _SSL"
-#~ msgstr "Koristi šifrovanu vezu"
-
-#~ msgid "_Secure connection"
-#~ msgstr "_Koristi sigurnu vezu"
-
-#~ msgid "Show icon in _notification area"
-#~ msgstr "Prikazuje ikonu u _obaveštajnoj zoni"
-
-#~ msgid "Popup _message together with the icon"
-#~ msgstr "Prikaži _poruku zajedno sa ikonom"
-
-#~ msgid "Generate a _D-Bus message"
-#~ msgstr "Stvara _D-Bus poruku"
-
-#~ msgid "SpamAssassin not found, code: %d"
-#~ msgstr "Ubica spama nije pronađen, kod: %d"
-
-#~ msgid "Failed to create pipe: %s"
-#~ msgstr "Nije uspelo pravljenje cevi: %s"
-
-#~ msgid "Error after fork: %s"
-#~ msgstr "Greška po izdvajanju: %s"
-
-#~ msgid "SpamAssassin child process does not respond, killing..."
-#~ msgstr "Zavisan proces Ubici spama nije odgovorio, ubijam..."
-
-#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
-#~ msgstr "Čekanje na zavisan proces Ubice spama ometeno, prekidam..."
-
-#~ msgid "Pipe to SpamAssassin failed, error code: %d"
-#~ msgstr "Cev ka Ubici spama je pukla, oznaka greške: %d"
-
-#~ msgid "SpamAssassin is not available. Please install it first."
-#~ msgstr "Ubica spama nije dostupan. Prvo ga instalirajte."
-
-#~ msgid "SpamAssassin Junk Filter"
-#~ msgstr "Filter neželjene pošte Ubica spama"
-
-#~ msgid "iCalendar format (.ics)"
-#~ msgstr "iKalendar oblik (.ics)"
-
-#~ msgid "E-Mail Address"
-#~ msgstr "Elektronska adresa"
-
-#~ msgid "failed to open book"
-#~ msgstr "neuspelo otvaranje knjige"
-
-#~ msgid "Invalid object"
-#~ msgstr "Neispravan objekat"
-
-#, fuzzy
-#~| msgid "Invalid folder: `%s'"
-#~ msgid "Invalid folder: %s"
-#~ msgstr "Neispravna fascikla „%s“"
-
-#~ msgid "Scanning folders in \"%s\""
-#~ msgstr "Pretraga fascikli u „%s“"
-
-#~ msgid "Creating folder '%s'"
-#~ msgstr "Pravljenje fascikle „%s“"
-
-#~ msgid "Scanning folders in '%s'"
-#~ msgstr "Pretraga fascikli u „%s“"
-
-#~ msgid "Retrieving quota information for folder '%s'"
-#~ msgstr "Dobijanje podataka o kvoti za fasciklu „%s“"
-
-#~ msgid "Error saving messages to: %s:\n"
-#~ msgstr "Greška pri čuvanju poruke u: %s:\n"
-
-#~ msgid "Checking Service"
-#~ msgstr "Provera servisa"
-
-#~ msgid "Updating Search Folders for '%s'"
-#~ msgstr "Ažuriranje fascikla pretrage za „%s“"
-
-#~ msgid "Show a map of all the contacts"
-#~ msgstr "Prikazuje kartu svih kontakata"
-
-#~ msgid "Add a map showing the location of contacts when possible."
-#~ msgstr "Dodaje kartu sa lokacijom kontakta, kada je moguće."
-
-#~ msgid "Map for contacts"
-#~ msgstr "Karta za kontakte"
-
-#~ msgid "Checklist"
-#~ msgstr "Spisak"
-
-#~ msgid "Enter password for %s (user %s)"
-#~ msgstr "Unesite lozinku za %s (korisnik %s)"
-
-#~ msgid "Failed to authenticate.\n"
-#~ msgstr "Neuspela autentifikacija.\n"
-
-#~ msgid "New _Shared Folder..."
-#~ msgstr "Nova _deljena fascikla..."
-
-#~ msgid "_Proxy Login..."
-#~ msgstr "Prijava za mrežnog _posrednika..."
-
-#~ msgid "Junk Mail Settings..."
-#~ msgstr "Postavke pošte za đubre..."
-
-#~ msgid "Track Message Status..."
-#~ msgstr "Prati status poruke..."
-
-#~ msgid "Retract Mail"
-#~ msgstr "Povuci poštu"
-
-#~ msgid "Accept"
-#~ msgstr "Prihvati"
-
-#~ msgid "Accept Tentatively"
-#~ msgstr "Prihvati uz rezervu"
-
-#~ msgid "Decline"
-#~ msgstr "Odbij"
-
-#~ msgid "Rese_nd Meeting..."
-#~ msgstr "Ponovo _šalji sastanak..."
-
-#~ msgid "Create folder"
-#~ msgstr "Napravi fasciklu"
-
-#~ msgid ""
-#~ "The user '%s' has shared a folder with you\n"
-#~ "\n"
-#~ "Message from '%s'\n"
-#~ "\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\n"
-#~ "Click 'Apply' to install the shared folder\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Korisnik „%s“ je sa Vama podelio fasciklu\n"
-#~ "\n"
-#~ "Poruka od „%s“\n"
-#~ "\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\n"
-#~ "Kliknite „Primeni“ za instalaciju deljene fascikle\n"
-#~ "\n"
-
-#~ msgid "Install the shared folder"
-#~ msgstr "Instaliraj deljenu fasciklu"
-
-#~ msgid "Shared Folder Installation"
-#~ msgstr "Instalacija deljene fascikle"
-
-#~ msgid "Junk Settings"
-#~ msgstr "Postavke za đubre"
-
-#~ msgid "Junk Mail Settings"
-#~ msgstr "Postavke pošte za đubre"
-
-#~ msgid "Email:"
-#~ msgstr "E-pošta:"
-
-#~ msgid "Junk List:"
-#~ msgstr "Spisak đubreta:"
-
-#~ msgid "_Enable"
-#~ msgstr "_Omogući"
-
-#~ msgid "_Junk List"
-#~ msgstr "Spisak đ_ubreta"
-
-#~ msgid "Message Retract"
-#~ msgstr "Povlačenje poruke"
-
-#~ msgid ""
-#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
-#~ "sure you want to do this?"
-#~ msgstr ""
-#~ "Povlačenje poruke je može ukloniti iz sandučeta primaoca. Želite li ovo da "
-#~ "uradite? "
-
-#~ msgid "Message retracted successfully"
-#~ msgstr "Poruka povučena uspešno"
-
-#~ msgid "Insert Send options"
-#~ msgstr "Umeće opcije slanja"
-
-#~ msgid "The participants will receive the following notification.\n"
-#~ msgstr "Učesnici će primiti sledeće obaveštenje.\n"
-
-#~ msgid "Add Send Options to GroupWise messages"
-#~ msgstr "Dodaj opcije slanja GroupWise porukama"
-
-#~ msgid "Fine-tune your GroupWise accounts."
-#~ msgstr "Fino podesite naloge GroupWise."
-
-#~ msgid "GroupWise Features"
-#~ msgstr "GroupWise mogućnosti"
-
-#~ msgid "Message retract failed"
-#~ msgstr "Povlačenje poruke nije uspelo"
-
-#~ msgid "The server did not allow the selected message to be retracted."
-#~ msgstr "Server nije dozvolio povlačenje izabrane poruke."
-
-#~ msgid ""
-#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
-#~ msgstr "Nalog imena &quot;{0}&quot; već postoji. Proverite stablo fascikli."
-
-#~ msgid "Account Already Exists"
-#~ msgstr "Nalog već postoji"
-
-#~ msgid "Invalid user"
-#~ msgstr "Neispravan korisnik"
-
-#~ msgid ""
-#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-#~ "address and try again."
-#~ msgstr ""
-#~ "Prijava na posrednika kao &quot;{0}&quot; nije bila uspešna. Proverite "
-#~ "adresu e-pošte i pokušajte ponovo."
-
-# mail:no-write-path-exists primary
-# mail:no-write-path-notfile primary
-#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-#~ msgstr "Korisniku &quot;{0}&quot; ne može biti dodeljen pristup posredniku"
-
-#~ msgid "Specify User"
-#~ msgstr "Izaberite korisnika"
-
-#~ msgid "You have already given proxy permissions to this user."
-#~ msgstr "Već imate ovlašćenja za posrednika za ovog korisnika."
-
-#~ msgid "You have to specify a valid user name to give proxy rights."
-#~ msgstr ""
-#~ "Morate navesti ispravno korisničko ime za davanje prava pristupa "
-#~ "posredniku."
-
-#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-#~ msgstr ""
-#~ "Ne možete podeliti ovu fasciklu sa navedenim korisnikom user &quot;{0}"
-#~ "&quot;"
-
-#~ msgid "You have to specify a user name which you want to add to the list"
-#~ msgstr "Morate navesti ime korisnika kojeg želite da dodate na spisak"
-
-#~ msgid "Do you want to resend the meeting?"
-#~ msgstr "Želite li ponovo da pošaljete sastanak?"
-
-#~ msgid "Do you want to resend the recurring meeting?"
-#~ msgstr "Želite li ponovo da pošaljete sastanak koji se ponavlja?"
-
-#~ msgid "Do you want to retract the original item?"
-#~ msgstr "Želite li da povučete originalnu stavku?"
-
-#~ msgid "The original will be removed from the recipient's mailbox."
-#~ msgstr "Original će biti uklonjen iz poštanskog sandučeta primaoca."
-
-#~ msgid "This is a recurring meeting"
-#~ msgstr "Ovaj sastanak se ponavlja"
-
-#~ msgid "This will create a new meeting using the existing meeting details."
-#~ msgstr ""
-#~ "Ovo će napraviti novi sastanak korišćenjem detalja postojećih sastanaka. "
-
-#~ msgid ""
-#~ "This will create a new meeting with the existing meeting details. The "
-#~ "recurrence rule needs to be re-entered."
-#~ msgstr ""
-#~ "Ovo će napraviti novi sastanak sa detaljima postojećih sastanaka. Pravilo "
-#~ "za ponavljanje morate uneti ponovo."
-
-#~ msgid "Would you like to accept it?"
-#~ msgstr "Prihvatate?"
-
-#~ msgid "Would you like to decline it?"
-#~ msgstr "Odbijate?"
-
-#~ msgid "C_ustomize notification message"
-#~ msgstr "_Prilagodi poruku za podsećanje"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "Kon_takti..."
-
-#~ msgid "Shared Folder Notification"
-#~ msgstr "Obaveštenje o deljenoj fascikli"
-
-#, fuzzy
-#~| msgid "Users"
-#~ msgid "Users:"
-#~ msgstr "Korisnici"
-
-#~ msgid "_Not Shared"
-#~ msgstr "_Nije deljeno"
-
-#~ msgid "_Shared With..."
-#~ msgstr "_Deljeno sa ..."
-
-#~ msgid "Access Rights"
-#~ msgstr "Prava pristupa"
-
-#~ msgid "Add/Edit"
-#~ msgstr "Dodaj/uredi"
-
-#~ msgid "Con_tacts"
-#~ msgstr "Kon_takti"
-
-#~ msgid "Modify _folders/options/rules/"
-#~ msgstr "Izmeni _fascikle/opcije/pravila/"
-
-#~ msgid "Read items marked _private"
-#~ msgstr "Čitaj stavke označene kao _lično"
-
-#~ msgid "Subscribe to my _notifications"
-#~ msgstr "Prijavi se na moja _obaveštenja"
-
-#~ msgid "_Write"
-#~ msgstr "_Piši"
-
-# E_BOOK_ERROR_URI_ALREADY_LOADED
-# E_BOOK_ERROR_PERMISSION_DENIED
-#~ msgid "permission to read|_Read"
-#~ msgstr "Dozvola za čitanje|_Čitaj"
-
-#~ msgid "Proxy"
-#~ msgstr "Mrežni posrednik"
-
-#~ msgid "Proxy Login"
-#~ msgstr "Prijava za mrežnog posrednika"
-
-#~ msgid "%sEnter password for %s (user %s)"
-#~ msgstr "%sUnesite lozinku za %s (korisnik %s)"
-
-#~ msgid "The Proxy tab will be available only when the account is online."
-#~ msgstr ""
-#~ "Jezičak za mrežnog posrednika će biti dostupan samo kada nalog bude na "
-#~ "mreži."
-
-#~ msgid "The Proxy tab will be available only when the account is enabled."
-#~ msgstr ""
-#~ "Jezičak za mrežnog posrednika će biti dostupan samo kada nalog bude "
-#~ "omogućen."
-
-#, fuzzy
-#~| msgid "Proxy"
-#~ msgctxt "GW"
-#~ msgid "Proxy"
-#~ msgstr "Mrežni posrednik"
-
-#~ msgid "Add User"
-#~ msgstr "Dodaje korisnika"
-
-#~ msgid "Advanced send options"
-#~ msgstr "Napredne opcije slanja"
-
-#~ msgid "Users"
-#~ msgstr "Korisnici"
-
-#~ msgid "Enter the users and set permissions"
-#~ msgstr "Unesite korisnike i postavite ovlašćenja"
-
-#~ msgid "Sharing"
-#~ msgstr "Deljenje"
-
-#~ msgid "Custom Notification"
-#~ msgstr "Prilagođeno obaveštenje"
-
-#~ msgid "Add   "
-#~ msgstr "Dodaj "
-
-#~ msgid "Modify"
-#~ msgstr "Izmeni"
-
-#~ msgid "Message Status"
-#~ msgstr "Status poruke"
-
-#~ msgid "Subject:"
-#~ msgstr "Naslov:"
-
-#~ msgid "From:"
-#~ msgstr "Šalje:"
-
-#~ msgid "Creation date:"
-#~ msgstr "Datum pravljenja:"
-
-#~ msgid "Recipient: "
-#~ msgstr "Primalac:"
-
-#~ msgid "Delivered: "
-#~ msgstr "Isporučeno:"
-
-#~ msgid "Opened: "
-#~ msgstr "Otvoreno:"
-
-#~ msgid "Accepted: "
-#~ msgstr "Prihvaćeno:"
-
-#~ msgid "Deleted: "
-#~ msgstr "Obrisano:"
-
-#~ msgid "Declined: "
-#~ msgstr "Odbijeno:"
-
-#~ msgid "Completed: "
-#~ msgstr "Završeno:"
-
-#~ msgid "Undelivered: "
-#~ msgstr "Neisporučeno:"
-
-#~ msgid ""
-#~ "Selected calendar contains some events for the given mails already. Would "
-#~ "you like to create new events anyway?"
-#~ msgstr ""
-#~ "Izabrani kalendar već sadrži neke događaje za date poruke. Želite li ipak "
-#~ "da napravite nove?"
-
-#~ msgid ""
-#~ "Selected task list contains some tasks for the given mails already. Would "
-#~ "you like to create new tasks anyway?"
-#~ msgstr ""
-#~ "Izabrani spisak već sadrži neke zadatke za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-
-#~ msgid ""
-#~ "Selected memo list contains some memos for the given mails already. Would "
-#~ "you like to create new memos anyway?"
-#~ msgstr ""
-#~ "Izabrani spisak već sadrži neke beleške za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-
-#~ msgid ""
-#~ "Selected calendar contains an event for the given mail already. Would you "
-#~ "like to create new event anyway?"
-#~ msgid_plural ""
-#~ "Selected calendar contains events for the given mails already. Would you "
-#~ "like to create new events anyway?"
-#~ msgstr[0] ""
-#~ "Izabrani kalendar već sadrži događaj za datu poruku. Želite li ipak da "
-#~ "napravite novi?"
-#~ msgstr[1] ""
-#~ "Izabrani kalendar već sadrži događaje za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-#~ msgstr[2] ""
-#~ "Izabrani kalendar već sadrži događaja za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-#~ msgstr[3] ""
-#~ "Izabrani kalendar već sadrži događaj za datu poruku. Želite li ipak da "
-#~ "napravite novi?"
-
-#~ msgid ""
-#~ "Selected task list contains a task for the given mail already. Would you "
-#~ "like to create new task anyway?"
-#~ msgid_plural ""
-#~ "Selected task list contains tasks for the given mails already. Would you "
-#~ "like to create new tasks anyway?"
-#~ msgstr[0] ""
-#~ "Izabrani spisak već sadrži zadatak za datu poruku. Želite li ipak da "
-#~ "napravite novi?"
-#~ msgstr[1] ""
-#~ "Izabrani spisak već sadrži zadatke za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-#~ msgstr[2] ""
-#~ "Izabrani spisak već sadrži zadataka za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-#~ msgstr[3] ""
-#~ "Izabrani spisak već sadrži zadatak za datu poruku. Želite li ipak da "
-#~ "napravite novi?"
-
-#~ msgid ""
-#~ "Selected memo list contains a memo for the given mail already. Would you "
-#~ "like to create new memo anyway?"
-#~ msgid_plural ""
-#~ "Selected memo list contains memos for the given mails already. Would you "
-#~ "like to create new memos anyway?"
-#~ msgstr[0] ""
-#~ "Izabrani spisak već sadrži belešku za datu poruku. Želite li ipak da "
-#~ "napravite novu?"
-#~ msgstr[1] ""
-#~ "Izabrani spisak već sadrži beleške za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-#~ msgstr[2] ""
-#~ "Izabrani spisak već sadrži beleški za date poruke. Želite li ipak da "
-#~ "napravite nove?"
-#~ msgstr[3] ""
-#~ "Izabrani spisak već sadrži belešku za datu poruku. Želite li ipak da "
-#~ "napravite novu?"
-
-#~ msgid "Failed to import contact's certificate"
-#~ msgstr "Neuspeo uvoz sertifikata kontakta"
-
-#~ msgid "(map)"
-#~ msgstr "(mapa)"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "Accessing LDAP Server anonymously"
-#~ msgstr "Anonimno pristupanje LDAP serveru"
-
-#~ msgid "Count of default recurrence for a new event. -1 means forever."
-#~ msgstr "Broj podrazumevanih ponavljanja novog događaja. -1 znači zauvek."
-
-#~ msgid "Default recurrence count"
-#~ msgstr "Podrazumevan broj ponavljanja"
-
-#~ msgid "Event Gradient"
-#~ msgstr "Stepen događaja"
-
-#~ msgid "Event Transparency"
-#~ msgstr "Providnost događaja"
-
-#~ msgid "Gradient of the events in calendar views."
-#~ msgstr "Stepen događaja u pregledu kalendara."
-
-#~ msgid ""
-#~ "Transparency of the events in calendar views, a value between 0 "
-#~ "(transparent) and 1 (opaque)."
-#~ msgstr ""
-#~ "Providnost dokađaja u pregledu kalendara, vrednost između 0 (providno) i "
-#~ "1 (neprovidno)"
-
-#~ msgid "URI of the highlighted (\"primary\") calendar"
-#~ msgstr "Adresa označenog „primarnog“ kalendara"
-
-#~ msgid "URI of the highlighted (\"primary\") memo list"
-#~ msgstr "Adresa označenog „primarnog“ spiska beleški"
-
-#~ msgid "URI of the highlighted (\"primary\") task list"
-#~ msgstr "Adresa označenog „primarnog“ spiska zadataka"
-
-#~ msgid "The organizer selected no longer has an account."
-#~ msgstr "Izabrani organizator više nema nalog."
-
-#~| msgid "Recurring"
-#~ msgid "Recurring:"
-#~ msgstr "Ponovno:"
-
-#~ msgid "Yes. (Complex Recurrence)"
-#~ msgstr "Da. (Složeno ponavljanje)"
-
-#~ msgid "Every day"
-#~ msgid_plural "Every %d days"
-#~ msgstr[0] "Svaki %d dan"
-#~ msgstr[1] "Svaka %d dana"
-#~ msgstr[2] "Svakih %d dana"
-#~ msgstr[3] "Svaki dan"
-
-#~ msgid "Every week"
-#~ msgid_plural "Every %d weeks"
-#~ msgstr[0] "Svake %d nedelje"
-#~ msgstr[1] "Svake %d nedelje"
-#~ msgstr[2] "Svakih %d nedelja"
-#~ msgstr[3] "Svake nedelje"
-
-#~ msgid "Every week on "
-#~ msgid_plural "Every %d weeks on "
-#~ msgstr[0] "Svake %d nedelje u "
-#~ msgstr[1] "Svake %d nedelje u "
-#~ msgstr[2] "Svakih %d nedelja u "
-#~ msgstr[3] "Svake nedelje u "
-
-#~ msgid " and "
-#~ msgstr " i "
-
-#~ msgid "The %s day of "
-#~ msgstr "%s dan od "
-
-#~ msgid "The %s %s of "
-#~ msgstr "%s %s od "
-
-# slično kao za nedelje
-#~ msgid "every month"
-#~ msgid_plural "every %d months"
-#~ msgstr[0] "svakog %d meseca"
-#~ msgstr[1] "svaka %d meseca"
-#~ msgstr[2] "svakih %d meseci"
-#~ msgstr[3] "svakog meseca"
-
-# slično kao za mesece i nedelje
-#~ msgid "Every year"
-#~ msgid_plural "Every %d years"
-#~ msgstr[0] "Svake %d godine"
-#~ msgstr[1] "Svake %d godine"
-#~ msgstr[2] "Svakih %d godina"
-#~ msgstr[3] "Svake godine"
-
-#~ msgid "a total of %d time"
-#~ msgid_plural "a total of %d times"
-#~ msgstr[0] "ukupno %d put"
-#~ msgstr[1] "ukupno %d puta"
-#~ msgstr[2] "ukupno %d puta"
-#~ msgstr[3] "ukupno %d put"
-
-#~ msgid ", ending on "
-#~ msgstr ", završavajući se "
-
-#~ msgid "Starts"
-#~ msgstr "Počinje"
-
-#~ msgid "Ends"
-#~ msgstr "Završava se"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iKalendar podaci"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iKalendar greška"
-
-#, fuzzy
-#~| msgid ""
-#~| "<br> Please review the following information, and then select an action "
-#~| "from the menu below."
-#~ msgid ""
-#~ "Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Proverite sledeći podatak i potom izaberite radnju iz donjeg menija."
-
-#~ msgid ""
-#~ "The meeting has been canceled, however it could not be found in your "
-#~ "calendars"
-#~ msgstr ""
-#~ "Sastanak je otkazan, međutim nije ga moguće naći u Vašim kalendarima"
-
-#~ msgid ""
-#~ "The task has been canceled, however it could not be found in your task "
-#~ "lists"
-#~ msgstr ""
-#~ "Zadatak je otkazan, međutim nije ga moguće naći u Vašim spiskovima "
-#~ "zadataka"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has published meeting information."
-#~ msgid "%s has published meeting information."
-#~ msgstr "<b>%s</b> objavljuje podatak o sastanku."
-
-#, fuzzy
-#~| msgid "<b>%s</b> requests the presence of %s at a meeting."
-#~ msgid "%s requests the presence of %s at a meeting."
-#~ msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
-
-#, fuzzy
-#~| msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgid "%s requests your presence at a meeting."
-#~ msgstr "<b>%s</b> zahteva Vaše prisustvo na sastanku."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Predlog za sastanak"
-
-#, fuzzy
-#~| msgid "<b>%s</b> wishes to be added to an existing meeting."
-#~ msgid "%s wishes to be added to an existing meeting."
-#~ msgstr "<b>%s</b> želi da bude deo postojećeg sastanka."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Ažuriranje sastanka"
-
-#, fuzzy
-#~| msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgid "%s wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> želi da dobije najnovija obaveštenja o sastanku."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "Zahtev za ažuriranjem sastanka"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has replied to a meeting request."
-#~ msgid "%s has replied to a meeting request."
-#~ msgstr "<b>%s</b> odgovara na zahtev za sastanak."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "Odgovor za sastanak"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has canceled a meeting."
-#~ msgid "%s has canceled a meeting."
-#~ msgstr "<b>%s</b> otkazuje sastanak."
-
-#~ msgid "Meeting Cancelation"
-#~ msgstr "Otkazivanje sastanka"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgid "%s has sent an unintelligible message."
-#~ msgstr "<b>%s</b> šalje nerazumljivu poruku."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Loša poruka o sastanku"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has published task information."
-#~ msgid "%s has published task information."
-#~ msgstr "<b>%s</b> objavljuje podatak o zadatku."
-
-#~ msgid "Task Information"
-#~ msgstr "Podatak o zadatku"
-
-#, fuzzy
-#~| msgid "<b>%s</b> requests %s to perform a task."
-#~ msgid "%s requests %s to perform a task."
-#~ msgstr "<b>%s</b> traži %s za izvršavanje zadatka."
-
-#, fuzzy
-#~| msgid "<b>%s</b> requests you perform a task."
-#~ msgid "%s requests you perform a task."
-#~ msgstr "<b>%s</b> traži da Vi izvršite zadatak."
-
-#~ msgid "Task Proposal"
-#~ msgstr "Predlog za zadatak"
-
-#, fuzzy
-#~| msgid "<b>%s</b> wishes to be added to an existing task."
-#~ msgid "%s wishes to be added to an existing task."
-#~ msgstr "<b>%s</b želi da bude deo postojećeg zadatka."
-
-#~ msgid "Task Update"
-#~ msgstr "Ažuriranje zadatka"
-
-#, fuzzy
-#~| msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgid "%s wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> želi da prima najnovija obaveštenja o zadatku."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Zahtev za ažuriranjem zadatka"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has replied to a task assignment."
-#~ msgid "%s has replied to a task assignment."
-#~ msgstr "<b>%s</b> odgovara na dodeljen zadatak."
-
-#~ msgid "Task Reply"
-#~ msgstr "Odgovor na zadatak"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has canceled a task."
-#~ msgid "%s has canceled a task."
-#~ msgstr "<b>%s</b> otkazuje zadatak."
-
-#~ msgid "Task Cancelation"
-#~ msgstr "Otkazivanje zadatka"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Loša poruka o zadatku"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has published free/busy information."
-#~ msgid "%s has published free/busy information."
-#~ msgstr "<b>%s</b> objavljuje slobodno/zauzeto vreme."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Slobodno/zauzeto vreme"
-
-#, fuzzy
-#~| msgid "<b>%s</b> requests your free/busy information."
-#~ msgid "%s requests your free/busy information."
-#~ msgstr "<b>%s</b> pita kada ste slobodni/zauzeti."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Slobodno/zauzeto zahtev"
-
-#, fuzzy
-#~| msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgid "%s has replied to a free/busy request."
-#~ msgstr "<b>%s</b> odgovara na slobodno/zauzeto zahtev."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Slobodno/zauzeto odgovor"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Loša slobodno/zauzeto poruka"
-
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Izgleda da poruka nije ispravno sačinjena"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Poruka sadrži samo nepodržane zahteve."
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Prilog nema stavke kalendara koji se mogu pregledati"
-
-#~ msgid "This response is not from a current attendee.  Add as an attendee?"
-#~ msgstr "Ovaj odgovor nije poslao prisutan učesnik.  Dodati ga u prisutne?"
-
-#~ msgid "Attendee status could not be updated because of an invalid status!\n"
-#~ msgstr "Status učesnika nije ažuriran jer nema ispravan status!\n"
-
-#~ msgid "Attendee status updated\n"
-#~ msgstr "Ažuriran status učesnika\n"
-
-#~ msgid "Item sent!\n"
-#~ msgstr "Stavka poslata!\n"
-
-#~ msgid "The item could not be sent!\n"
-#~ msgstr "Stavka nije mogla biti poslata!\n"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Izaberite radnju:"
-
-#~ msgid "Update"
-#~ msgstr "Ažuriraj"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Prihvati sa rezervom"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Pošalji slobodno/zauzeto podatak"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Osveži status sagovornika"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Pošalji najnoviji podatak"
-
-#~ msgid "--to--"
-#~ msgstr "--za--"
-
-#~ msgid "Calendar Message"
-#~ msgstr "Poruka kalendara"
-
-#~ msgid "Date:"
-#~ msgstr "Datum:"
-
-#~ msgid "Loading Calendar"
-#~ msgstr "Učitavanje kalendara"
-
-#~ msgid "Loading calendar..."
-#~ msgstr "Učitavanje kalendara..."
-
-#~ msgid "Organizer:"
-#~ msgstr "Organizator:"
-
-#~ msgid "Server Message:"
-#~ msgstr "Poruka servera:"
-
-#~ msgid "Unable to reconstruct message from autosave file"
-#~ msgstr "Nije moguće povratiti poruku iz automatskog čuvanja"
-
-# mail-composer:no-editor-control primary
-#~ msgid "Could not create composer window."
-#~ msgstr "Nije moguće napraviti prozor za sastavljanje."
-
-#~ msgid ""
-#~ "Unable to activate the HTML editor control.\n"
-#~ "\n"
-#~ "Please make sure that you have the correct version of gtkhtml and "
-#~ "libgtkhtml installed."
-#~ msgstr ""
-#~ "Nije moguće pokretanje kontrole HTML uređivača.\n"
-#~ "\n"
-#~ "Proverite da li imate odgovarajuće verzije gtkhtml i libgtkhtml na "
-#~ "sistemu."
-
-#~ msgid "Unable to activate the address selector control."
-#~ msgstr "Nije moguće pokretanje kontrole biranja adresa."
-
-#~ msgid "Run Anjal in a window"
-#~ msgstr "Pokreni Anjal u prozoru"
-
-#~ msgid "Make Anjal the default email client"
-#~ msgstr "Označava Anjal za podrazumevanog klijenta pošte"
-
-#~ msgid "Anjal email client"
-#~ msgstr "Klijent pošte Anjal"
-
-#~| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-#~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-#~ msgstr "<span size=\"large\" weight=\"bold\">Detalji:</span>"
-
-#~| msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-#~ msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-#~ msgstr "<span size=\"large\" weight=\"bold\">Primanje:</span>"
-
-#~| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-#~ msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-#~ msgstr "<span size=\"large\" weight=\"bold\">Slanje:</span>"
-
-#, fuzzy
-#~| msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-#~ msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-#~ msgstr "<span size=\"large\" weight=\"bold\">Lični podaci:</span>"
-
-#, fuzzy
-#~| msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-#~ msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-#~ msgstr "<span size=\"large\" weight=\"bold\">Upravljanje naloga</span>"
-
-#~ msgid "%s..."
-#~ msgstr "%s..."
-
-#~ msgid "Evolution Error"
-#~ msgstr "Greška Evolucije"
-
-#~ msgid "Evolution Warning"
-#~ msgstr "Upozorenje Evolucije"
-
-# bug(slobo): mogli su dati i bolji original, dobili su isto tako smislen prevod
-#~ msgid "Internal error, unknown error '%s' requested"
-#~ msgstr "Unutrašnja greška, zahtevana je nepoznata greška „%s“"
-
-#~| msgid "%d days from now"
-#~ msgid "%d day from now"
-#~ msgid_plural "%d days from now"
-#~ msgstr[0] "Za %d dan"
-#~ msgstr[1] "Za %d dana"
-#~ msgstr[2] "Za %d dana"
-#~ msgstr[3] "Za %d dan"
-
-#~| msgid "%d days ago"
-#~ msgid "%d day ago"
-#~ msgid_plural "%d days ago"
-#~ msgstr[0] "Pre %d dan"
-#~ msgstr[1] "Pre %d dana"
-#~ msgstr[2] "Pre %d dana"
-#~ msgstr[3] "Pre %d dan"
-
-#~ msgid "Debug Logs"
-#~ msgstr "Dnevnici dijagnoze kvara"
-
-#~ msgid "Show _errors in the status bar for"
-#~ msgstr "Prikaži u traci statusa _greške za"
-
-# bug: plural-forms
-#~ msgid "second(s)."
-#~ msgstr "sekund(e)."
-
-#~ msgid "Log Messages:"
-#~ msgstr "Unosi dnevnika:"
-
-#~ msgid "Log Level"
-#~ msgstr "Nivo zapisivanja u dnevnik"
-
-#~ msgid "Error"
-#~ msgstr "Greška"
-
-#~ msgid "Errors"
-#~ msgstr "Greške"
-
-#~ msgid "Warnings and Errors"
-#~ msgstr "Upozorenja i greške"
-
-#~ msgid "Debug"
-#~ msgstr "Dijagnoza kvara"
-
-#~ msgid "Error, Warnings and Debug messages"
-#~ msgstr "Poruke o grešci, upozorenju i dijagnozi kvara"
-
-#~ msgid "%s License Agreement"
-#~ msgstr "%s ugovor o licenci"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please read carefully the license agreement\n"
-#~ "for %s displayed below\n"
-#~ "and tick the check box for accepting it\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Pažljivo pročitajte dole prikazan ugovor o licenci\n"
-#~ "za %s\n"
-#~ "i označite kućicu da bi ga prihvatili\n"
-
-#~ msgid "Account Management"
-#~ msgstr "Upravljanje nalozima"
-
-#~ msgid "This store does not support subscriptions, or they are not enabled."
-#~ msgstr "Ova ostava ne podržava prijave, ili nisu omogućene."
-
-#~ msgid "Folder"
-#~ msgstr "Fascikla"
-
-#~ msgid "Please select a server."
-#~ msgstr "Izaberite server."
-
-#~ msgid "No server has been selected"
-#~ msgstr "Nije izabran server"
-
-#~ msgid "Default height of the subscribe dialog."
-#~ msgstr "Podrazumevana visina prozorčeta za prijavu."
-
-#~ msgid "Default width of the subscribe dialog."
-#~ msgstr "Podrazumevana širina prozorčeta za prijavu."
-
-#~ msgid "Subscribe dialog default height"
-#~ msgstr "Podrazumevana visina prozora za prijavu"
-
-#~ msgid "Subscribe dialog default width"
-#~ msgstr "Podrazumevana širina prozora za prijavu"
-
-#~ msgid "(Note: Requires restart of the application)"
-#~ msgstr "(Napomena: zahteva ponovno pokretanje programa)"
-
-#~ msgid "Checks incoming mail messages to be Junk"
-#~ msgstr "Proveri da pristigle poruke nisu đubre"
-
-#, fuzzy
-#~| msgid "Do not format messages when text si_ze exceeds"
-#~ msgid "Do not display messages when text si_ze exceeds"
-#~ msgstr "Ne formatiraj poruke kada veliči_na pređe"
-
-#~ msgid "Enable Magic S_pacebar"
-#~ msgstr "Omogućava Magičnu razmak_nicu"
-
-#~ msgid "Enable Sea_rch Folders"
-#~ msgstr "Uključi fascikle pret_rage"
-
-#~ msgid "Fi_xed-width:"
-#~ msgstr "Utvrđene-širine:"
-
-#~ msgid "Font Properties"
-#~ msgstr "Osobine fonta"
-
-#~ msgid "KB"
-#~ msgstr "KB"
-
-#~ msgid "Message Fonts"
-#~ msgstr "Fontovi poruke"
-
-#~ msgid ""
-#~ "Note: you will not be prompted for a password until you connect for the "
-#~ "first time"
-#~ msgstr ""
-#~ "Napomena: nećete biti upitani za lozinku dok se ne povežete prvi put"
-
-#~ msgid "Printed Fonts"
-#~ msgstr "Fontovi za štampu"
-
-#, fuzzy
-#~| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-#~ msgid "Prompt when sending replies to _many recipients"
-#~ msgstr "Upozori kada šalješ poruke samo sa navedenim Bcc primaocima"
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Odabira fasciklu Priprema"
-
-#~ msgid "Select HTML fixed width font for printing"
-#~ msgstr "Izaberite HTML font fiksirane veličine za štampu"
-
-#~ msgid "Select HTML variable width font for printing"
-#~ msgstr "Izaberite HTML font promenljive veličine za štampu"
-
-#, fuzzy
-#~| msgid "Select Folder"
-#~ msgid "Select Junk Folder"
-#~ msgstr "Izaberite fasciklu"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Odabira fasciklu Poslato"
-
-#, fuzzy
-#~| msgid "Select Drafts Folder"
-#~ msgid "Select Trash Folder"
-#~ msgstr "Odabira fasciklu Priprema"
-
-#~ msgid "Sending Mail"
-#~ msgstr "Slanje pošte"
-
-#~ msgid "Sent and Draft Messages"
-#~ msgstr "Poslate poruke i nacrti"
-
-#, fuzzy
-#~| msgid "Posting destination"
-#~ msgid "Top Posting Option"
-#~ msgstr "Odredišna pošta"
-
-#~ msgid "V_ariable-width:"
-#~ msgstr "Pro_menljiva veličina:"
-
-#~ msgid "_Mark messages as read after"
-#~ msgstr "_Označi poruke kao pročitane posle"
-
-#~ msgid "_Show image animations"
-#~ msgstr "Prikaži _animacije"
-
-#~ msgid "_Shrink To / Cc / Bcc headers to "
-#~ msgstr "_Sažmi zaglavlja To / Cc / Bcc u "
-
-#~ msgid "addresses"
-#~ msgstr "Adrese"
-
-#~ msgid "S_erver:"
-#~ msgstr "S_erver:"
-
-#~ msgid "Opening store '%s'"
-#~ msgstr "Otvaranje ostave „%s“"
-
-#~ msgid ""
-#~ "Cannot create output file: %s:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Nije moguće pravljenje izlazne datoteke: %s:\n"
-#~ " %s"
-
-#~| msgid "Could not write data: %s"
-#~ msgid "Could not write data: "
-#~ msgstr "Nije moguć upis podataka: "
-
-#~ msgid "Delete messages in Search Folder \"{0}\"?"
-#~ msgstr "Obrisati poruke u fascikli pretrage „{0}“?"
-
-#~ msgid ""
-#~ "Error on %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Greška na %s\n"
-#~ " %s"
-
-#~ msgid "Header Value Contains:"
-#~ msgstr "Vrednost zaglavlja sadrži:"
-
-#, fuzzy
-#~| msgid "_Backup Settings..."
-#~ msgid "_Backup Evolution Settings..."
-#~ msgstr "_Izrađuje rezervu postavki..."
-
-#, fuzzy
-#~| msgid "R_estore Settings..."
-#~ msgid "R_estore Evolution Settings..."
-#~ msgstr "Op_oravlja postavke..."
-
-#, fuzzy
-#~| msgid "Select folder to import into"
-#~ msgid "Select folder to import OE folder into"
-#~ msgstr "Izaberite fasciklu za uvoz"
-
-#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-#~ msgstr "Izaberite png sliku (najbolje 48*48, veličine < 720 bajta)"
-
-#~ msgid "_Sharing"
-#~ msgstr "_Deljenje"
-
-#~ msgid "Blink icon in notification area."
-#~ msgstr "Trepćuća ikona u obaveštajnoj zoni."
-
-#~ msgid "Whether the icon should blink or not."
-#~ msgstr "Da li da ikona trepće ili ne."
-
-#~ msgid "Evolution's Mail Notification"
-#~ msgstr "Evolucijino obaveštenje o pošti"
-
-#~ msgid "Mail Notification Properties"
-#~ msgstr "Podešavanja obaveštenja o pošti"
-
-#~ msgid "B_link icon in notification area"
-#~ msgstr "Tre_peri ikona u obaveštajnoj zoni "
-
-#~ msgid "Manage your Evolution plugins."
-#~ msgstr "Upravlja dodacima Evolucije."
-
-#~ msgid "Evolution Profiler"
-#~ msgstr "Evolucijin ispitivač"
-
-#~ msgid "Profile data events in Evolution (for developers only)."
-#~ msgstr "Događaji profila podataka u Evoluciji (samo za programere)."
-
-#~ msgid "Sort mail message threads by subject."
-#~ msgstr "Razvrstava poruke u raspravi prema naslovu."
-
-#~ msgid "Subject Threading"
-#~ msgstr "Razvrstavanje poruka po naslovu rasprave"
-
-#~ msgid "Thread messages by subject"
-#~ msgstr "Razvrstava poruke u raspravi prema naslovu"
-
-#~ msgid "Drafts based template plugin"
-#~ msgstr "Priključak za obrazac nacrta"
-
-#~ msgid "Start Evolution activating the specified component"
-#~ msgstr "Pokreni Evoluciju uz navedeni deo"
-
-#~ msgid "begin editing this cell"
-#~ msgstr "počni uređivanjem ove ćelije"
+msgstr "Načini unosa"
author	Мирослав Николић <miroslavnikolic@rocketmail.com>	2012-07-27 17:56:56 +0800
committer	Мирослав Николић <miroslavnikolic@rocketmail.com>	2012-07-27 17:56:56 +0800
commit	e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d (patch)
tree	65184ed05ba4b7ecfeb3c3e53c62f6b864554f64 /po/sr@latin.po
parent	3e9527915eb617990a4567d4a3fa3194afc1cf38 (diff)
download	gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.gz gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.bz2 gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.lz gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.xz gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.tar.zst gsoc2013-evolution-e03d9fbc7efba1a0239f85a8cf7339bbad6b1c7d.zip