Updated Serbian translation (by Igor Nestorovic)

svn path=/trunk/; revision=34233

1 files changed, 2064 insertions, 1894 deletions

diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index d45a436681..0c3c973ee5 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 03:24+0100\n"
-"PO-Revision-Date: 2007-07-21 13:50+0200\n"
+"POT-Creation-Date: 2007-09-11 14:59+0200\n"
+"PO-Revision-Date: 2007-09-10 13:42+0100\n"
 "Last-Translator: Igor Nestorović <igor@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -94,7 +94,7 @@ msgstr "Kalendarski događaj: nema pregled."
 msgid "calendar view event"
 msgstr "događaj pregleda kalendara"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Uhvati fokus"
 
@@ -118,7 +118,7 @@ msgstr "Idi na današnji dan"
 msgid "Go to Date"
 msgstr "Idi na datum"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
@@ -164,7 +164,7 @@ msgid "calendar view for one or more days"
 msgstr "pregled kalendara za jedan ili više dana"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:726
+#: ../calendar/gui/calendar-component.c:743
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -180,9 +180,9 @@ msgstr "%A, %d. %b %Y."
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:729
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/e-day-view-top-item.c:1340
+#: ../calendar/gui/e-day-view.c:2118
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -191,9 +191,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:748
+#: ../calendar/gui/calendar-component.c:753
+#: ../calendar/gui/calendar-component.c:755
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -201,10 +201,10 @@ msgstr "%a %d %b %Y."
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:763
-#: ../calendar/gui/calendar-component.c:765
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/calendar-component.c:780
+#: ../calendar/gui/calendar-component.c:782
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -218,25 +218,25 @@ msgstr "%d. %b %Y."
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:772
+#: ../calendar/gui/e-day-view-top-item.c:1344
+#: ../calendar/gui/e-day-view.c:2134
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "linija pretrage"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "linija pretrage evolucija kalendara"
 
@@ -292,19 +292,19 @@ msgstr "biranje"
 msgid "toggle the cell"
 msgstr "biranje ćelije"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "razgranava"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "razgranava red u ETree gde se ćelija nalazi"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "skuplja"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "skuplja red u ETree gde se ćelija nalazi"
 
@@ -314,7 +314,7 @@ msgstr "Ćelija tabele"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
+#: ../widgets/table/e-table-click-to-add.c:571
 msgid "click to add"
 msgstr "kliknite da dodate"
 
@@ -544,7 +544,7 @@ msgid ""
 msgstr ""
 "Vaši kontakti za {0} neće biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
@@ -613,7 +613,8 @@ msgstr "Podesite samodopunjavanje ovde"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:277 ../calendar/gui/migration.c:402
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Kontakti"
@@ -654,8 +655,8 @@ msgstr "Upravljajte S/MIME sertifikatima ovde"
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:488
-#: ../calendar/gui/calendar-component.c:236
+#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../calendar/gui/calendar-component.c:237
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
 #: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:199
@@ -673,20 +674,20 @@ msgstr "Na ovom računaru"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:496
+#: ../addressbook/gui/component/addressbook-migrate.c:505
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:246
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:491
+#: ../calendar/gui/calendar-component.c:248
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
 #: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:204 ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:107
+#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:122
+#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Lično"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:506
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
@@ -707,7 +708,7 @@ msgid "Create a new contact list"
 msgstr "Napravi novu kontakt listu"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1208
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Novi imenik"
 
@@ -723,61 +724,61 @@ msgstr "Napravi novi imenik"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Neuspela nadogradnja podešavanja imenika ili njegovih fascikli."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Baza"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:365
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:87
-#: ../plugins/itip-formatter/itip-formatter.c:2228
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2238
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Opšte"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/widgets/e-addressbook-view.c:565
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Imenik"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentifikacija"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalji"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:849
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:865
 msgid "Searching"
 msgstr "Pretraživanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Podešavanja imenika"
@@ -793,15 +794,15 @@ msgstr "Prenošenje..."
 msgid "Migrating `%s':"
 msgstr "Prenošenje ’%s‘:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:634
+#: ../addressbook/gui/component/addressbook-migrate.c:643
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:749
+#: ../addressbook/gui/component/addressbook-migrate.c:758
 msgid "Autocompletion Settings"
 msgstr "Podešavanja samodopunjavanja"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1124
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -813,7 +814,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1138
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -823,7 +824,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1147
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -833,7 +834,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -844,25 +845,21 @@ msgstr ""
 "Budite strpljivi dok Evolucija prenosi podatke sa Pilot Sync uređaja..."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../mail/em-folder-utils.c:504
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj fasciklu „%s“ u:"
 
 #: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../mail/em-folder-utils.c:506
 msgid "Rename Folder"
 msgstr "Preimenuj fasciklu"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../mail/em-folder-utils.c:512
 msgid "Folder names cannot contain '/'"
 msgstr "Imena fascikli ne mogu da sadrže ’/‘"
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "Jedna fascikla sa tim imenom već postoji"
-
 #: ../addressbook/gui/component/addressbook-view.c:956
 msgid "_New Address Book"
 msgstr "_Novi imenik"
@@ -870,11 +867,11 @@ msgstr "_Novi imenik"
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../addressbook/gui/widgets/e-addressbook-view.c:981
-#: ../calendar/gui/calendar-component.c:590
-#: ../calendar/gui/e-calendar-table.c:1303
-#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:919
-#: ../calendar/gui/memos-component.c:458 ../calendar/gui/tasks-component.c:449
-#: ../mail/em-folder-tree.c:2122 ../mail/em-folder-view.c:1157
+#: ../calendar/gui/calendar-component.c:607
+#: ../calendar/gui/e-calendar-table.c:1376
+#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:992
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2109 ../mail/em-folder-view.c:1233
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -886,8 +883,8 @@ msgid "Save As Vcard..."
 msgstr "Sačuvaj kao VKartu..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:591
-#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
+#: ../calendar/gui/calendar-component.c:608
+#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
 msgid "_Properties..."
 msgstr "Po_dešavanja..."
 
@@ -900,12 +897,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupanje LDAP serveru"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:507
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "Neuspela autentifikacija.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:487
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
@@ -1226,8 +1223,8 @@ msgid "_Login method:"
 msgstr "Metod _prijave:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:225
-#: ../mail/mail-config.glade.h:169
+#: ../calendar/gui/dialogs/calendar-setup.c:229
+#: ../mail/mail-config.glade.h:171
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ime:"
@@ -1241,7 +1238,7 @@ msgid "_Search scope:"
 msgstr "Obim p_retrage:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erver:"
@@ -1263,8 +1260,8 @@ msgstr "karte"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
+#: ../mail/em-account-editor.c:2064
+#: ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:561
 msgid "minutes"
 msgstr "minuta"
@@ -1322,7 +1319,7 @@ msgstr "Kontakt"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
@@ -1367,7 +1364,7 @@ msgstr "Telefon"
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:580
 #: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "Work"
 msgstr "Posao"
 
@@ -1389,7 +1386,7 @@ msgid "_Birthday:"
 msgstr "_Rođendan:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:909
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1833
 msgid "_Calendar:"
@@ -1500,10 +1497,10 @@ msgstr "Adresa"
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1830 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3604
-#: ../widgets/text/e-text.c:3605
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1831 ../widgets/text/e-entry.c:1258
+#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3682
 msgid "Editable"
 msgstr "Izmenljivo"
 
@@ -2479,10 +2476,10 @@ msgstr "Zimbabve"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/plugin-manager/plugin-manager.c:54
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "Ime"
 
@@ -2516,7 +2513,7 @@ msgstr "Servis"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../plugins/publish-calendar/publish-calendar.c:514
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Mesto"
@@ -2582,20 +2579,20 @@ msgid "Changed"
 msgstr "Promenjeno"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Uređivač za kontakte - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2603,23 +2600,23 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3117
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ ima nevažeći format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ ima nevažeći format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3129
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3150
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3165
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
@@ -2631,15 +2628,15 @@ msgstr "Brzo dodavanje kontakta"
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:339
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:349
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:360
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:361
 msgid "_Select Address Book"
 msgstr "_Izaberi imenik"
 
@@ -2859,11 +2856,11 @@ msgstr "Otkriven dupli kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
-"Promenjena elektronska adresa ili ime ovog kontakta\n"
-"već postoji u ovoj fascikli.  Želite li ipak da dodate?"
+"Ime ili elektronska adresa ovog kontakta već postoji u ovoj fascikli.  "
+"Želite li ipak da ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2882,14 +2879,12 @@ msgstr ""
 "u ovoj fascikli.  Želite li ipak da dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:190
-#, fuzzy
 msgid "Merge Contact"
-msgstr "Novi kontakt"
+msgstr "Pripoji kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:205
-#, fuzzy
-msgid "Merge"
-msgstr "Poruka"
+msgid "_Merge"
+msgstr "_Pripoji"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:258
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
@@ -2942,12 +2937,12 @@ msgid "Error getting book view"
 msgstr "Greška pri učitavanju pregleda knjige"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3340
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3468 ../widgets/text/e-text.c:3469
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:307
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821
+#: ../widgets/text/e-entry.c:1202 ../widgets/text/e-entry.c:1203
+#: ../widgets/text/e-text.c:3545 ../widgets/text/e-text.c:3546
 msgid "Model"
 msgstr "Model"
 
@@ -2975,8 +2970,8 @@ msgstr "Sačuvaj kao VKartu..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:959
 #: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1354
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:975
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvori"
@@ -3031,13 +3026,13 @@ msgid "Cu_t"
 msgstr "_Iseci"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
-#: ../calendar/gui/calendar-component.c:589
+#: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
-#: ../calendar/gui/memos-component.c:457 ../calendar/gui/tasks-component.c:448
-#: ../composer/e-msg-composer.c:3223 ../mail/em-folder-tree.c:1006
-#: ../mail/em-folder-view.c:1142 ../mail/message-list.c:1962
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:983
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../composer/e-msg-composer.c:3221 ../mail/em-folder-tree.c:988
+#: ../mail/em-folder-view.c:1218 ../mail/message-list.c:1962
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3093,6 +3088,7 @@ msgstr "Telefon u kolima"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3101,9 +3097,8 @@ msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 #: ../addressbook/gui/widgets/eab-contact-display.c:566
-#, fuzzy
 msgid "Company"
-msgstr "Pr_eduzeće:"
+msgstr "Preduzeće"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
@@ -3233,32 +3228,32 @@ msgstr "Veb strana"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:514
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:657
+#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Width"
 msgstr "Širina"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-field-chooser-item.c:664
+#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
 msgid "Height"
 msgstr "Visina"
 
@@ -3359,16 +3354,16 @@ msgstr "Izabrano"
 msgid "Has Cursor"
 msgstr "Ima kursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:633
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u čitaču"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2602
+#: ../mail/em-folder-view.c:2603
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:634
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
@@ -3410,13 +3405,14 @@ msgstr "_Video razgovor:"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 #: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/gnome-cal.c:2354
+#: ../calendar/gui/calendar-component.c:791
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2349
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:396
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:540
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3448,12 +3444,12 @@ msgid "Web Log"
 msgstr "_Veb log:"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2287
+#: ../calendar/gui/e-calendar-view.c:2322
 msgid "Birthday"
 msgstr "_Rođendan:"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2323
 msgid "Anniversary"
 msgstr "_Godišnjica:"
 
@@ -3524,10 +3520,10 @@ msgstr "Protokol nije podržan"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:239
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
+#: ../calendar/gui/e-calendar-table.c:475 ../calendar/gui/print.c:2351
 msgid "Canceled"
 msgstr "Otkazano"
 
@@ -3538,7 +3534,7 @@ msgstr "Nije moguće odustati"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
@@ -3655,7 +3651,7 @@ msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:710
+#: ../addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
@@ -3672,7 +3668,7 @@ msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:660
+#: ../addressbook/gui/widgets/eab-gui-util.c:663
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
@@ -3694,8 +3690,16 @@ msgstr[2] ""
 "Otvaranje %d kontakta će otvoriti i %d novih prozora.\n"
 "Da li zaista želite da prikažete ove kontakte?"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:301
+msgid "_Don't Display"
+msgstr "_Ne prikazuj"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:302
+msgid "Display _All Contacts"
+msgstr "Prikaži _sve kontakte"
+
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:328
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3704,15 +3708,15 @@ msgstr ""
 "%s već postoji\n"
 "Želite li da prepišete?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:329
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 msgid "Overwrite"
 msgstr "Prepiši"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
 #: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
@@ -3720,49 +3724,49 @@ msgstr[1] "kontakti"
 msgstr[2] "kontakta"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:464
+#: ../addressbook/gui/widgets/eab-gui-util.c:467
 msgid "Select Address Book"
 msgstr "Izaberi imenik"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:605
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:774
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
 msgid "Copy contact to"
 msgstr "Umnoži kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
+#: ../addressbook/gui/widgets/eab-gui-util.c:779
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:778
+#: ../addressbook/gui/widgets/eab-gui-util.c:781
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
 msgid "Multiple VCards"
 msgstr "Brojne VKarte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
+#: ../addressbook/gui/widgets/eab-gui-util.c:1010
 #, c-format
 msgid "VCard for %s"
 msgstr "VKarta za %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1048
-#: ../addressbook/gui/widgets/eab-gui-util.c:1066
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+#: ../addressbook/gui/widgets/eab-gui-util.c:1069
 msgid "Contact information"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1068
+#: ../addressbook/gui/widgets/eab-gui-util.c:1071
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontakt podaci za %s"
@@ -3885,12 +3889,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1898
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../widgets/table/e-table-click-to-add.c:493
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:650
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1896
+#: ../widgets/table/e-table-selection-model.c:314
 msgid "Header"
 msgstr "Zaglavlje"
 
@@ -3992,7 +3996,7 @@ msgstr "Senčenje"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:963
+#: ../plugins/exchange-operations/exchange-account-setup.c:964
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4083,13 +4087,12 @@ msgid "Export in asynchronous mode"
 msgstr "Izvezi u neusklađenom režimu"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
-"Broj karti u jednoj izlaznoj datoteci u neusklađenom režimu, podrazumevano "
-"100."
+"Broj karti u jednoj izlaznoj datoteci u neusklađenom režimu, podrazumevana "
+"veličina 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
@@ -4135,18 +4138,12 @@ msgstr ""
 "šta je zaduženje."
 
 #: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"Svi podaci u ovim unosima u dnevnik će biti obrisani i neće se moći "
-"povratiti."
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "Svi podaci u ovim beleškama biće obrisani i neće se moći povratiti."
 
-# calendar:prompt-delete-journal secondary
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr "Svi podaci u ovom dnevniku biće obrisani i neće se moći povratiti."
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "Svi podaci u ovoj belešci biće obrisani i neće se moći povratiti."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4170,16 +4167,13 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr ""
-"Svi podaci o ovom unosu u dnevnik će biti obrisani i neće se moći povratiti."
-
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "Svi podaci o ovom sastanku će biti uklonjeni i neće se moći povratiti."
 
+#: ../calendar/calendar.error.xml.h:9
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "Svi podaci u ovoj belešci će biti uklonjeni i neće se moći povratiti."
+
 # calendar:prompt-delete-named-task secondary
 # calendar:prompt-delete-task secondary
 #: ../calendar/calendar.error.xml.h:10
@@ -4195,18 +4189,17 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Sigurno želite da obrišete zakazani sastanak nazvan ’{0}‘?"
 
 #: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Sigurno želite da obrišete unos u dnevnik ’{0}‘?"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Sigurno želite da obrišete belešku ’{0}‘ ?"
 
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Sigurno želite da obrišete ove {0} zakazane sastanke?"
 
-# bug: plural-forms
 #: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Sigurno želite da obrišete ove {0} unose u dnevnik?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Sigurno želite da obrišete ove {0} beleške?"
 
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:16
@@ -4218,24 +4211,23 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Sigurno želite da obrišete ovaj zakazani sastanak?"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Sigurno želite da obrišete ovaj unos u dnevnik?"
-
-#: ../calendar/calendar.error.xml.h:19
 #: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
 
+#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:189
+msgid "Are you sure you want to delete this memo?"
+msgstr "Sigurno želite da obrišete ovau belešku?"
+
 #: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno želite da obrišete ovo zaduženje?"
 
 #: ../calendar/calendar.error.xml.h:21
-#, fuzzy
 msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Sigurno želite da pošaljete zaduženje bez sačinjenog pregleda?"
+msgstr "Sigurno želite da sačuvate belešku bez sačinjenog pregleda?"
 
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the appointment without a summary?"
@@ -4308,18 +4300,18 @@ msgstr "Greška pri učitavanju spiska zaduženja"
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
+"the meeting is canceled."
 msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
-"znati da je dnevnik obrisan."
+"znati da je sastanak otkazan."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"the memo has been deleted."
 msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
-"znati da je sastanak otkazan."
+"znati da je beleška obrisana."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4414,8 +4406,8 @@ msgid "Would you like to save your changes to this task?"
 msgstr "Želite li da sačuvate promene na zaduženju?"
 
 #: ../calendar/calendar.error.xml.h:57
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "Želite li da pošaljete obaveštenje o otkazivanju za ovaj unos u dnevnik?"
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Želite li da pošaljete obaveštenje o otkazivanju za ovau belešku?"
 
 # calendar:prompt-cancel-task primary
 #: ../calendar/calendar.error.xml.h:58
@@ -4494,7 +4486,8 @@ msgid "_Save Changes"
 msgstr "Sačuvaj pro_mene"
 
 #: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Pošalji"
 
@@ -4506,59 +4499,61 @@ msgstr "Pošalji po_dsetnik"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:253
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "Podeli višednevne događaje:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1504
-#: ../calendar/conduits/calendar/calendar-conduit.c:1505
-#: ../calendar/conduits/memo/memo-conduit.c:930
-#: ../calendar/conduits/memo/memo-conduit.c:931
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1107
+#: ../calendar/conduits/calendar/calendar-conduit.c:1512
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/memo/memo-conduit.c:813
+#: ../calendar/conduits/memo/memo-conduit.c:814
+#: ../calendar/conduits/todo/todo-conduit.c:1012
+#: ../calendar/conduits/todo/todo-conduit.c:1013
 msgid "Could not start evolution-data-server"
 msgstr "Neuspelo pokretanje evolucija-servera-podataka"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1612
-#: ../calendar/conduits/calendar/calendar-conduit.c:1615
+#: ../calendar/conduits/calendar/calendar-conduit.c:1620
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
 msgid "Could not read pilot's Calendar application block"
 msgstr "Neuspelo čitanje programskog bloka pilotovog Kalendara"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1024
-#: ../calendar/conduits/memo/memo-conduit.c:1027
+#: ../calendar/conduits/memo/memo-conduit.c:907
+#: ../calendar/conduits/memo/memo-conduit.c:910
 msgid "Could not read pilot's Memo application block"
 msgstr "Neuspelo čitanje pilotovog bloka beleški"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1071
-#: ../calendar/conduits/memo/memo-conduit.c:1074
+#: ../calendar/conduits/memo/memo-conduit.c:954
+#: ../calendar/conduits/memo/memo-conduit.c:957
 msgid "Could not write pilot's Memo application block"
 msgstr "Neuspeo upis pilotovog bloka beleški"
 
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
 msgstr "Podrazumevana važnost:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1190
-#: ../calendar/conduits/todo/todo-conduit.c:1193
+#: ../calendar/conduits/todo/todo-conduit.c:1096
+#: ../calendar/conduits/todo/todo-conduit.c:1099
 msgid "Could not read pilot's ToDo application block"
 msgstr "Neuspelo čitanje pilotovog ToDo programskog bloka"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1235
-#: ../calendar/conduits/todo/todo-conduit.c:1238
+#: ../calendar/conduits/todo/todo-conduit.c:1141
+#: ../calendar/conduits/todo/todo-conduit.c:1144
 msgid "Could not write pilot's ToDo application block"
 msgstr "Neuspeo upis u pilotov blok „uraditi“"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2219
+#: ../plugins/itip-formatter/itip-formatter.c:2229
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zaduženja"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1380
+#: ../calendar/gui/calendar-component.c:1388
 msgid "Calendars"
 msgstr "Kalendari"
 
@@ -4599,24 +4594,25 @@ msgid "Memo_s"
 msgstr "Be_leške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:324 ../calendar/gui/e-memos.c:1093
-#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:536
-#: ../calendar/gui/memos-component.c:1013 ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/e-memo-table.c:335 ../calendar/gui/e-memos.c:1093
+#: ../calendar/gui/gnome-cal.c:1667 ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:1031 ../calendar/gui/memos-control.c:336
 #: ../calendar/gui/memos-control.c:352
 msgid "Memos"
 msgstr "Beleške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1541 ../calendar/gui/print.c:1809
-#: ../calendar/gui/tasks-component.c:527
-#: ../calendar/gui/tasks-component.c:1018 ../calendar/gui/tasks-control.c:478
-#: ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/e-calendar-table.c:538 ../calendar/gui/e-tasks.c:1357
+#: ../calendar/gui/gnome-cal.c:1539 ../calendar/gui/print.c:1809
+#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:1026 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:397
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:541
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Zaduženja"
@@ -4646,7 +4642,7 @@ msgstr[2] "minuta"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:562
 msgid "hours"
 msgid_plural "hours"
@@ -4665,8 +4661,8 @@ msgstr "Zakazani sastanci"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1570
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1620
 #: ../calendar/gui/e-itip-control.c:1145
 #: ../plugins/itip-formatter/itip-view.c:998
 msgid "Location:"
@@ -4678,7 +4674,7 @@ msgstr "Vreme _dremanja:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:163
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:165
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4699,32 +4695,32 @@ msgstr "Dre_manje"
 msgid "location of appointment"
 msgstr "zakazano mesto sastanka"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1429
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1552
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
 msgid "No summary available."
 msgstr "Nema dostupnog pregleda."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1438
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1440
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1482
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1484
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o mestu."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1536
 #, c-format
 msgid "You have %d alarms"
 msgstr "Broj postavljenih alarma: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1654
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1658
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4736,7 +4732,7 @@ msgstr ""
 "podsetnik podešen da pošalje poruku. Evolucija će\n"
 "umesto toga prikazati normalno prozorče."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4753,7 +4749,7 @@ msgstr ""
 "\n"
 "Sigurno želite da pokrenete ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -4762,8 +4758,10 @@ msgid "Could not initialize Bonobo"
 msgstr "Nije moguće pokrenuti Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "Nije moguće pokrenuti servis za upozorenja"
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr "Nije moguće pokrenuti servis za upozorenja, možda je već aktivan..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -5040,12 +5038,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Prikaži polje „Stanje“ u uređivaču događaja/zaduženja/susreta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži površ „Pregled“"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Show the \"Preview\" pane."
 msgstr "Prikazuje površ „Pregled“."
 
@@ -5254,38 +5252,32 @@ msgid "Unmatched"
 msgstr "Ne odgovara"
 
 #: ../calendar/gui/cal-search-bar.c:631
-msgid "Next 7 days Tasks"
-msgstr ""
+msgid "Next 7 Days' Tasks"
+msgstr "Zaduženja za sledeću nedelju"
 
 #: ../calendar/gui/cal-search-bar.c:635
-#, fuzzy
 msgid "Active Tasks"
-msgstr "_Dodeljeno zaduženje"
+msgstr "Aktivna zaduženja"
 
 #: ../calendar/gui/cal-search-bar.c:639
-#, fuzzy
-msgid "Over Due Tasks"
-msgstr "_Neispunjena zaduženja:"
+msgid "Overdue Tasks"
+msgstr "Prekoračena zaduženja"
 
 #: ../calendar/gui/cal-search-bar.c:643
-#, fuzzy
 msgid "Completed Tasks"
-msgstr "Završeno "
+msgstr "Završena zaduženja"
 
 #: ../calendar/gui/cal-search-bar.c:647
-#, fuzzy
-msgid "Tasks With Attachments"
-msgstr "Poruke sa prilozima"
+msgid "Tasks with Attachments"
+msgstr "Zaduženja sa prilozima"
 
 #: ../calendar/gui/cal-search-bar.c:693
-#, fuzzy
 msgid "Active Appointments"
-msgstr "Zakazani sastanci"
+msgstr "Aktivni sastanci"
 
 #: ../calendar/gui/cal-search-bar.c:697
-#, fuzzy
-msgid "Next 7 Day Appointments"
-msgstr "Celo_dnevni sastanak"
+msgid "Next 7 Days' Appointments"
+msgstr "Sastanci u sledećih 7 dana"
 
 #: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
@@ -5308,7 +5300,7 @@ msgstr "Izbaci događaje starije od"
 
 #: ../calendar/gui/calendar-commands.c:335
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:563
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
@@ -5318,89 +5310,89 @@ msgstr "dana"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:265
-#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
 #: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
-#: ../calendar/gui/tasks-component.c:223
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Na vebu"
 
-#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i godišnjice"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/calendar-component.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../calendar/gui/calendar-component.c:588
+#: ../calendar/gui/calendar-component.c:605
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../calendar/gui/calendar-component.c:918
+#: ../calendar/gui/calendar-component.c:935
 msgid "Failed upgrading calendars."
 msgstr "Neuspela dopuna kalendara."
 
-#: ../calendar/gui/calendar-component.c:1217
+#: ../calendar/gui/calendar-component.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nije moguće otvoriti kalendar ’%s‘ za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1233
+#: ../calendar/gui/calendar-component.c:1250
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/calendar-component.c:1355
+#: ../calendar/gui/calendar-component.c:1363
 msgid "Calendar Source Selector"
 msgstr "Birač izvora kalendara"
 
-#: ../calendar/gui/calendar-component.c:1563
+#: ../calendar/gui/calendar-component.c:1581
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1582
 msgid "_Appointment"
 msgstr "_Zakazani sastanak"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1583
 msgid "Create a new appointment"
 msgstr "Zakazuje novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1571
+#: ../calendar/gui/calendar-component.c:1589
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1572
+#: ../calendar/gui/calendar-component.c:1590
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../calendar/gui/calendar-component.c:1573
+#: ../calendar/gui/calendar-component.c:1591
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../calendar/gui/calendar-component.c:1579
+#: ../calendar/gui/calendar-component.c:1597
 msgid "New all day appointment"
 msgstr "Novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1580
+#: ../calendar/gui/calendar-component.c:1598
 msgid "All Day A_ppointment"
 msgstr "Celo_dnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1581
+#: ../calendar/gui/calendar-component.c:1599
 msgid "Create a new all-day appointment"
 msgstr "Pravi novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1605
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:1588
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../calendar/gui/calendar-component.c:1589
+#: ../calendar/gui/calendar-component.c:1607
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
@@ -5422,29 +5414,27 @@ msgstr "Mesečni pregled"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:2
-#, fuzzy
-msgid "Description Contain"
-msgstr "Opis sadrži"
+msgid "Description Contains"
+msgstr "Opisi"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
 #: ../calendar/gui/tasktypes.xml.h:3
-#, fuzzy
-msgid "Summary Contain"
-msgstr "Pregled sadrži"
+msgid "Summary Contains"
+msgstr "Pregledi"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Greška pri otvaranju kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Metod nije podržan pri otvaranju kalendara"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1282
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1282
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -5496,7 +5486,6 @@ msgid "Run a program"
 msgstr "Pokreće program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
-#, fuzzy
 msgid "Select A File"
 msgstr "Izaberite datoteku"
 
@@ -5587,7 +5576,7 @@ msgstr "_Predloži automatski prikaz priloga"
 msgid "Attach file(s)"
 msgstr "Prilaže datoteku(e)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za koje zvoni sat"
 
@@ -5693,7 +5682,7 @@ msgstr ""
 "Nedelja"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Bira boju"
 
@@ -5840,43 +5829,43 @@ msgstr "_Sre"
 msgid "before every appointment"
 msgstr "pre svakog sastanka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:268
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 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:270
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "_Umnožava sadržaj liste zaduženja lokalno za rad van mreže"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 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:342
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "C_olor:"
 msgstr "_Boja:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Spisak zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Spisak beleški"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:478
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:480
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:536
 msgid "Task List Properties"
 msgstr "Osobine liste zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:630
+#: ../calendar/gui/dialogs/calendar-setup.c:592
 msgid "New Memo List"
 msgstr "Novi spisak beleški"
 
@@ -5889,8 +5878,8 @@ msgid "This task has been deleted."
 msgstr "Ovo zaduženje je obrisano."
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Ovaj unos u dnevnik je obrisan."
+msgid "This memo has been deleted."
+msgstr "Ova beleška je obrisana."
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5911,8 +5900,8 @@ msgid "This task has been changed."
 msgstr "Ovo zaduženje je promenjeno."
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Ovaj unos u dnevnik je promenjen."
+msgid "This memo has been changed."
+msgstr "Ova beleška je promenjena."
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5949,15 +5938,15 @@ msgstr " (Do "
 msgid "Due "
 msgstr "Do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2960
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2968
 #, c-format
 msgid "Attached message - %s"
 msgstr "Priložena poruka - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2965
-#: ../composer/e-msg-composer.c:3160
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2973
+#: ../composer/e-msg-composer.c:3158
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5965,14 +5954,14 @@ msgstr[0] "%d priložena poruka"
 msgstr[1] "%d priložene poruke"
 msgstr[2] "%d priloženih poruka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3224
-#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1038 ../mail/message-list.c:1963
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3222
+#: ../mail/em-folder-tree.c:989 ../mail/em-folder-utils.c:369
+#: ../mail/em-folder-view.c:1114 ../mail/message-list.c:1963
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3226
-#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3224
+#: ../mail/em-folder-tree.c:991 ../mail/message-list.c:1965
 msgid "Cancel _Drag"
 msgstr "Otkaži _prevlačenje"
 
@@ -5980,7 +5969,7 @@ msgstr "Otkaži _prevlačenje"
 msgid "Could not update object"
 msgstr "Nije moguće osvežiti objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2577
+#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2585
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5998,8 +5987,8 @@ msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:3741
+#: ../calendar/gui/dialogs/event-page.c:1977
+#: ../calendar/gui/dialogs/task-page.c:1255 ../composer/e-msg-composer.c:3739
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
@@ -6007,18 +5996,18 @@ msgid "_Remove"
 msgstr "_Ukloni"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../composer/e-msg-composer.c:3742 ../mail/em-folder-tree.c:2129
+#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
 msgid "_Properties"
 msgstr "O_sobine"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../composer/e-msg-composer.c:3744
+#: ../composer/e-msg-composer.c:3742
 msgid "_Add attachment..."
 msgstr "_Dodaj prilog..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1566
-#: ../mail/em-format-html-display.c:2318
+#: ../mail/em-format-html-display.c:2320
 msgid "Show Attachments"
 msgstr "Prikaži p_riloge"
 
@@ -6058,27 +6047,27 @@ msgstr "Zaduženje - %s"
 #: ../calendar/gui/dialogs/comp-editor.c:2190
 #: ../calendar/gui/dialogs/comp-editor.c:2233
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Unos u dnevnik - %s"
+msgid "Memo - %s"
+msgstr "Beleška - %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2201
 #: ../calendar/gui/dialogs/comp-editor.c:2243
 msgid "No summary"
 msgstr "Nema pregleda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2789 ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:350
+#: ../calendar/gui/dialogs/comp-editor.c:2791 ../mail/em-utils.c:370
+#: ../widgets/misc/e-attachment-bar.c:361
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2878
-#: ../calendar/gui/dialogs/comp-editor.c:2932
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2880
+#: ../calendar/gui/dialogs/comp-editor.c:2934
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Promene načinjene na ovom predmetu mogu biti zanemarene ako bude osvežen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:2987
 msgid "Unable to use current version!"
 msgstr "Nije moguće korišćenje tekuće verzije!"
 
@@ -6107,8 +6096,8 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Beleška nije moglo biti obrisana zbog corba greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -6123,8 +6112,8 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "Zaduženje nije moglo biti obrisano jer pristup nije dozvoljen"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Unos u dnevnik nije mogao biti obrisan jer pristup nije dozvoljen"
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Beleška nije mogla biti obrisana jer pristup nije dozvoljen"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6139,8 +6128,8 @@ msgid "The task could not be deleted due to an error"
 msgstr "Zaduženje nije moglo biti obrisano usled greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Unos u dnevnik nije mogao biti obrisan usled greške"
+msgid "The memo could not be deleted due to an error"
+msgstr "Beleška nije mogla biti obrisana usled greške"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
@@ -6168,81 +6157,88 @@ msgstr "Zaka_zani sastanak"
 msgid "Recurrence"
 msgstr "Učestalost"
 
-#: ../calendar/gui/dialogs/event-page.c:820
-#: ../calendar/gui/dialogs/event-page.c:2734
+#: ../calendar/gui/dialogs/event-page.c:836
+#: ../calendar/gui/dialogs/event-page.c:2848
 msgid "This event has alarms"
 msgstr "Za ovaj događaj je navijen sat"
 
-#: ../calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.c:916
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
+#: ../calendar/gui/dialogs/task-page.c:460
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:954
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:935
+#: ../calendar/gui/dialogs/event-page.c:956
 msgid "Atte_ndees"
 msgstr "Uč_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:1100
+#: ../calendar/gui/dialogs/event-page.c:1139
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:1103
+#: ../calendar/gui/dialogs/event-page.c:1142
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:1272
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:884
 msgid "Start date is wrong"
 msgstr "Datum početka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1282
+#: ../calendar/gui/dialogs/event-page.c:1323
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1346
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1312
+#: ../calendar/gui/dialogs/event-page.c:1353
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1515
+#: ../calendar/gui/dialogs/memo-page.c:741
+#: ../calendar/gui/dialogs/task-page.c:943
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1521
+#: ../calendar/gui/dialogs/memo-page.c:747
+#: ../calendar/gui/dialogs/task-page.c:949
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1546
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1914
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1978
+#: ../calendar/gui/dialogs/task-page.c:1256
 msgid "_Add "
 msgstr "_Dodaj "
 
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2724
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvaranje kalendara ’%s‘."
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2768
+#: ../calendar/gui/dialogs/memo-page.c:957
+#: ../calendar/gui/dialogs/task-page.c:1764
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "Delujete u ime %s"
+
+#: ../calendar/gui/dialogs/event-page.c:3067
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6250,7 +6246,7 @@ msgstr[0] "%d dan pre zakazanog sastanka"
 msgstr[1] "%d dana pre zakazanog sastanka"
 msgstr[2] "%d dana pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3073
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6258,7 +6254,7 @@ msgstr[0] "%d sat pre zakazanog sastanka"
 msgstr[1] "%d sata pre zakazanog sastanka"
 msgstr[2] "%d sati pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/dialogs/event-page.c:3079
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6266,7 +6262,7 @@ msgstr[0] "%d minut pre zakazanog sastanka"
 msgstr[1] "%d minuta pre zakazanog sastanka"
 msgstr[2] "%d minuta pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.c:2972
+#: ../calendar/gui/dialogs/event-page.c:3092
 msgid "Customize"
 msgstr "Prilagodi"
 
@@ -6276,18 +6272,18 @@ msgstr "Prilagodi"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2977
+#: ../calendar/gui/dialogs/event-page.c:3097
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2361
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2369
 #: ../filter/filter-rule.c:891 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
+#: ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:200
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1910
+#: ../plugins/itip-formatter/itip-formatter.c:1920
 #: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
 #: ../widgets/misc/e-dateedit.c:1718
 msgid "None"
@@ -6380,14 +6376,16 @@ msgstr "Organizator:"
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:919
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nije moguće otvaranje beleški u „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1503
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1103 ../mail/em-format-html.c:1520
+#: ../mail/em-format-html.c:1534 ../mail/em-format-html.c:1592
+#: ../mail/em-format-html.c:1618 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:856 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:18
 msgid "To"
 msgstr "Prima"
 
@@ -6405,7 +6403,7 @@ msgid "_Description:"
 msgstr "_Opis:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:453
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupa:"
@@ -6422,11 +6420,9 @@ msgstr "Delegirate povratni događaj, šta želite da delegirate?"
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Menjate povratno zaduženje, šta želite da izmenite?"
 
-# povratni > redovni
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
@@ -6636,48 +6632,48 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-calendar-table.c:474 ../calendar/gui/e-itip-control.c:923
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Završeno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:399 ../mail/message-list.c:1034
 msgid "High"
 msgstr "Visoka"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:233
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:660
 #: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2345
+#: ../calendar/gui/e-calendar-table.c:473 ../calendar/gui/print.c:2345
 msgid "In Progress"
 msgstr "U toku"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:401 ../mail/message-list.c:1032
 msgid "Low"
 msgstr "Mala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:927 ../calendar/gui/e-calendar-table.c:400
 #: ../mail/message-list.c:1033
 msgid "Normal"
 msgstr "Obična"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-cal-component-preview.c:243
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
+#: ../calendar/gui/e-calendar-table.c:472 ../calendar/gui/print.c:2342
 msgid "Not Started"
 msgstr "Nije započeto"
 
@@ -6690,7 +6686,7 @@ msgid "Stat_us:"
 msgstr "_Stanje:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "Undefined"
 msgstr "Neodređena"
 
@@ -6708,7 +6704,7 @@ msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
 #: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1250
+#: ../calendar/gui/tasks-component.c:1258
 msgid "_Task"
 msgstr "_Zaduženje"
 
@@ -6716,11 +6712,11 @@ msgstr "_Zaduženje"
 msgid "Task Details"
 msgstr "Detalji zaduženja"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:857
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1721
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zaduženja u ’%s‘."
@@ -6734,9 +6730,8 @@ msgid "Categor_ies..."
 msgstr "Ka_tegorije..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
 msgid "De_scription:"
-msgstr "Opis:"
+msgstr "O_pis:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
@@ -6829,71 +6824,71 @@ msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3000
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3001
 #, c-format
 msgid "Click to open %s"
 msgstr "Pritisnite da otvorite %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:157
-#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:805
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
 #: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:208
-#: ../calendar/gui/e-cal-component-preview.c:197
-#: ../calendar/gui/e-cal-component-preview.c:208
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:221
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:254
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
-#: ../calendar/gui/e-cal-component-preview.c:190
+#: ../calendar/gui/e-cal-component-preview.c:193
 #: ../calendar/gui/e-itip-control.c:1135
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Pregled:"
 
-#: ../calendar/gui/e-cal-component-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Due Date:"
 msgstr "Datum za završetak:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
 #: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Priority:"
 msgstr "Važnost:"
 
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
+#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:377
 msgid "Public"
 msgstr "Javno"
 
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
+#: ../calendar/gui/e-calendar-table.c:378
 msgid "Private"
 msgstr "Lično"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
+#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
+#: ../calendar/gui/e-calendar-table.c:379
 msgid "Confidential"
 msgstr "Poverljivo"
 
@@ -6914,12 +6909,12 @@ msgid "Summary"
 msgstr "Pregled"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:451
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-calendar-table.c:452
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Zauzeto"
@@ -6934,7 +6929,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:933
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
 #: ../calendar/gui/e-meeting-store.c:764
@@ -6942,7 +6937,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:933
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:178
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6950,26 +6945,26 @@ msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-model.c:330 ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1316
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1206
-#: ../plugins/itip-formatter/itip-formatter.c:393
-#: ../plugins/itip-formatter/itip-formatter.c:1935
-#: ../plugins/plugin-manager/plugin-manager.c:77
-#: ../widgets/misc/e-attachment-bar.c:712
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:394
+#: ../plugins/itip-formatter/itip-formatter.c:1945
+#: ../plugins/plugin-manager/plugin-manager.c:82
+#: ../widgets/misc/e-attachment-bar.c:724
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:929
 msgid "Recurring"
 msgstr "Ponovno"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:931
 msgid "Assigned"
 msgstr "Dodeljeno"
 
@@ -6977,108 +6972,108 @@ msgstr "Dodeljeno"
 msgid "Save As..."
 msgstr "Sačuvaj kao..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2163
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
 msgid "Select folder to save selected attachments..."
 msgstr "Izaberite fasciklu za čuvanje izabranih priloga..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:447
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:450
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1153 ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1356
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:977
+#: ../mail/em-folder-view.c:1229 ../mail/em-popup.c:567 ../mail/em-popup.c:578
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:565
-#: ../mail/em-popup.c:576
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:579
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:281
 msgid "_Save Selected"
 msgstr "_Sačuvaj izabrano"
 
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:786
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:789
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:421
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:422
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:423
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:424
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:425
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:426
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:427
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:428
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:429
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:430
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:431
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
+#: ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:494
 msgid "Deleting selected objects"
 msgstr "Brisanje izabranih objekata"
 
-#: ../calendar/gui/e-calendar-table.c:958
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
+#: ../calendar/gui/e-calendar-table.c:996
+#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:697
 msgid "Updating objects"
 msgstr "Osvežavanje objekata"
 
-#: ../calendar/gui/e-calendar-table.c:1107
-#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:799
-#: ../composer/e-msg-composer.c:1398
+#: ../calendar/gui/e-calendar-table.c:1180
+#: ../calendar/gui/e-calendar-view.c:1228 ../calendar/gui/e-memo-table.c:872
+#: ../composer/e-msg-composer.c:1405
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1278
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-table.c:1351
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New _Task"
 msgstr "Novo zad_uženje"
 
-#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
+#: ../calendar/gui/e-calendar-table.c:1355 ../calendar/gui/e-memo-table.c:976
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../calendar/gui/e-calendar-table.c:1284
-#: ../calendar/gui/e-calendar-view.c:1665
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:905
-#: ../mail/em-folder-view.c:1154
+#: ../calendar/gui/e-calendar-table.c:1357
+#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:978
+#: ../mail/em-folder-view.c:1230
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7086,52 +7081,52 @@ msgstr "Otvori _Veb stranicu"
 msgid "_Print..."
 msgstr "Štam_paj..."
 
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:982
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iseci"
 
-#: ../calendar/gui/e-calendar-table.c:1290
-#: ../calendar/gui/e-calendar-view.c:1668
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:911
+#: ../calendar/gui/e-calendar-table.c:1363
+#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:984
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "U_baci"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1367 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
+#: ../calendar/gui/e-calendar-table.c:1368 ../calendar/gui/e-memo-table.c:988
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iKalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1369
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1370
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1371
 msgid "_Mark as Incomplete"
 msgstr "_Obeleži kao nezavršeno"
 
-#: ../calendar/gui/e-calendar-table.c:1299
+#: ../calendar/gui/e-calendar-table.c:1372
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Obeleži izabrana zaduženja kao nezavršena"
 
-#: ../calendar/gui/e-calendar-table.c:1304
+#: ../calendar/gui/e-calendar-table.c:1377
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: ../calendar/gui/e-calendar-table.c:1537
+#: ../calendar/gui/e-calendar-table.c:1611
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite za novo zaduženje"
@@ -7141,7 +7136,7 @@ msgstr "Kliknite za novo zaduženje"
 msgid "% Complete"
 msgstr "% Završeno"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:698
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Završeno"
 
@@ -7173,101 +7168,101 @@ msgstr "Status"
 msgid "Task sort"
 msgstr "Razvrstavanje zaduženja"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1347
 msgid "Moving items"
 msgstr "Premeštanje predmeta"
 
-#: ../calendar/gui/e-calendar-view.c:1350
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Copying items"
 msgstr "Umnožavanje predmeta"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1658
 msgid "New _Appointment..."
 msgstr "Novi _sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Meeting"
 msgstr "Novi _sastanak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1671
 msgid "_Current View"
 msgstr "_Trenutni pregled"
 
-#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Select T_oday"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1674
 msgid "_Select Date..."
 msgstr "_Izaberi datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Reply"
 msgstr "O_dgovori"
 
-#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1147
-#: ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../calendar/gui/e-calendar-view.c:1696 ../mail/em-folder-view.c:1223
+#: ../mail/em-popup.c:572 ../mail/em-popup.c:583
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1701
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1702 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2165
+#: ../calendar/gui/e-calendar-view.c:2200
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2169
+#: ../calendar/gui/e-calendar-view.c:2204
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2185 ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2220 ../calendar/gui/print.c:2316
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2216
+#: ../calendar/gui/e-calendar-view.c:2251
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -7291,13 +7286,12 @@ msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #: ../calendar/gui/e-cell-date-edit-text.c:127
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "%s"
 msgstr ""
 "Datum mora biti unet u obliku: \n"
-"\n"
 "%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
@@ -7320,22 +7314,22 @@ msgstr "%02i minutni razmaci"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1336
+#: ../calendar/gui/e-day-view.c:2101
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
+#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-day-view.c:1098
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:811
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-day-view.c:1101
+#: ../calendar/gui/e-week-view.c:509 ../calendar/gui/print.c:813
 msgid "pm"
 msgstr "pm"
 
@@ -7487,21 +7481,21 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:802
-#: ../plugins/itip-formatter/itip-formatter.c:1923
+#: ../calendar/gui/itip-utils.c:730
+#: ../plugins/itip-formatter/itip-formatter.c:1933
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:805
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:733
+#: ../plugins/itip-formatter/itip-formatter.c:1936
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:808 ../calendar/gui/itip-utils.c:837
-#: ../plugins/itip-formatter/itip-formatter.c:1929
+#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
+#: ../plugins/itip-formatter/itip-formatter.c:1939
 msgid "Declined"
 msgstr "Odbijeno"
 
@@ -7517,255 +7511,255 @@ msgid ""
 msgstr ""
 "Zaduženje je otkazano, međutim nije ga moguće naći u Vašim spiskovima zaduženja"
 
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> objavi podatak o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1337
 msgid "Meeting Information"
 msgstr "Podatak o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1345
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva Vaše prisustvo na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1346
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1352
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> želi da bude deo postojećeg sastanka."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1353
 msgid "Meeting Update"
 msgstr "Osvežavanje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1357
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi da dobije najnovija obaveštenja o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Meeting Update Request"
 msgstr "Zahtev za osvežavanjem sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odgovori na zahtev za sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> otkaza sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1374
 msgid "Meeting Cancelation"
 msgstr "Otkazivanje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1384 ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1501
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> posla nerazumljivu poruku."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1412
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> objavi podatak o zaduženju."
 
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1413
 msgid "Task Information"
 msgstr "Podatak o zaduženju"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1420
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži %s za izvršavanje zaduženja."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1422
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da Vi izvršite zaduženje."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1423
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b želi da bude deo postojećeg zaduženja."
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Update"
 msgstr "Osvežavanje zaduženja"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi da prima najnovija obaveštenja o zaduženju."
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Update Request"
 msgstr "Zahtev za osvežavanjem zaduženja"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odgovori na dodeljeno zaduženje."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1450
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> otkaza zaduženje."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1451
 msgid "Task Cancelation"
 msgstr "Otkazivanje zaduženja"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1486
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> objavi slobodno/zauzeto vreme."
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1487
 msgid "Free/Busy Information"
 msgstr "Slobodno/zauzeto vreme"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1491
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pita kada ste slobodni/zauzeti."
 
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1492
 msgid "Free/Busy Request"
 msgstr "Slobodno/zauzeto zahtev"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1496
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odgovori na slobodno/zauzeto zahtev."
 
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1497
 msgid "Free/Busy Reply"
 msgstr "Slobodno/zauzeto odgovor"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1502
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodno/zauzeto poruka"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1577
 msgid "The message does not appear to be properly formed"
 msgstr "Poruka izgleda da nije ispravno sačinjena"
 
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1636
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1669
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1701
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema predmete kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1944
+#: ../calendar/gui/e-itip-control.c:1943
 msgid "Update complete\n"
 msgstr "Osvežavanje završeno\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekat nije ispravan i ne može biti osvežen\n"
 
-#: ../calendar/gui/e-itip-control.c:1994
+#: ../calendar/gui/e-itip-control.c:1993
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan učesnik.  Dodati ga u prisutne?"
 
-#: ../calendar/gui/e-itip-control.c:2012
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Stanje učesnika nije osveženo jer nema ispravano stanje!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "Attendee status updated\n"
 msgstr "Osvežen status učesnika\n"
 
-#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1228
+#: ../calendar/gui/e-itip-control.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:1229
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje učesnika nije osveženo jer predmet više ne postoji"
 
-#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
+#: ../calendar/gui/e-itip-control.c:2073 ../calendar/gui/e-itip-control.c:2130
 msgid "Item sent!\n"
 msgstr "Predmet poslat!\n"
 
-#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
+#: ../calendar/gui/e-itip-control.c:2079 ../calendar/gui/e-itip-control.c:2138
 msgid "The item could not be sent!\n"
 msgstr "Predmet nije mogao biti poslat!\n"
 
-#: ../calendar/gui/e-itip-control.c:2223
+#: ../calendar/gui/e-itip-control.c:2218
 msgid "Choose an action:"
 msgstr "Izaberite radnju:"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2289
 msgid "Update"
 msgstr "Osveži"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2317
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2325
+#: ../calendar/gui/e-itip-control.c:2318
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2326
+#: ../calendar/gui/e-itip-control.c:2319
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2348
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodno/zauzeto podatak"
 
-#: ../calendar/gui/e-itip-control.c:2383
+#: ../calendar/gui/e-itip-control.c:2376
 msgid "Update respondent status"
 msgstr "Osveži status sagovornika"
 
-#: ../calendar/gui/e-itip-control.c:2411
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviji podatak"
 
-#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:825
+#: ../calendar/gui/e-itip-control.c:2432 ../calendar/gui/itip-utils.c:753
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Poništi"
@@ -7872,8 +7866,8 @@ msgstr "Sa rezervom"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:811
-#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../calendar/gui/itip-utils.c:739
+#: ../plugins/itip-formatter/itip-formatter.c:1942
 msgid "Delegated"
 msgstr "Delegirano"
 
@@ -8017,11 +8011,11 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Član"
 
-#: ../calendar/gui/e-memo-table.c:920
+#: ../calendar/gui/e-memo-table.c:993
 msgid "_Delete Selected Memos"
 msgstr "_Obriši izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1144 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pritisnite da dodate belešku"
 
@@ -8030,7 +8024,7 @@ msgid "Memo sort"
 msgstr "Razvrstavanje beleški"
 
 #: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2828
+#: ../calendar/gui/gnome-cal.c:2822
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8083,43 +8077,43 @@ msgstr "Izaberite vremensku zonu"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:824
+#: ../calendar/gui/gnome-cal.c:822
 msgid "Updating query"
 msgstr "Osvežavanje upita"
 
-#: ../calendar/gui/gnome-cal.c:2479
+#: ../calendar/gui/gnome-cal.c:2474
 msgid "_Custom View"
 msgstr "Pr_ilagođen pregled"
 
-#: ../calendar/gui/gnome-cal.c:2480
+#: ../calendar/gui/gnome-cal.c:2475
 msgid "_Save Custom View"
 msgstr "Sačuvaj prilagođen preg_led"
 
-#: ../calendar/gui/gnome-cal.c:2485
+#: ../calendar/gui/gnome-cal.c:2480
 msgid "_Define Views..."
 msgstr "Odre_di preglede..."
 
-#: ../calendar/gui/gnome-cal.c:2651
+#: ../calendar/gui/gnome-cal.c:2646
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavanje sastanaka sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2670
+#: ../calendar/gui/gnome-cal.c:2665
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavanje zaduženja sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2679
+#: ../calendar/gui/gnome-cal.c:2674
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Učitavanje beleški na %s"
 
-#: ../calendar/gui/gnome-cal.c:2787
+#: ../calendar/gui/gnome-cal.c:2781
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaranje %s"
 
-#: ../calendar/gui/gnome-cal.c:3726
+#: ../calendar/gui/gnome-cal.c:3718
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -8179,65 +8173,65 @@ msgstr "Septembar"
 msgid "_Select Today"
 msgstr "_Izaberi današnji dan"
 
-#: ../calendar/gui/itip-utils.c:523 ../calendar/gui/itip-utils.c:572
-#: ../calendar/gui/itip-utils.c:678
+#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
+#: ../calendar/gui/itip-utils.c:606
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:559
+#: ../calendar/gui/itip-utils.c:487
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:887
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Event information"
 msgstr "Podatak o događaju"
 
-#: ../calendar/gui/itip-utils.c:766 ../calendar/gui/itip-utils.c:889
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
 msgid "Task information"
 msgstr "Podatak o zaduženju"
 
-#: ../calendar/gui/itip-utils.c:768 ../calendar/gui/itip-utils.c:891
-msgid "Journal information"
-msgstr "Podatak o dnevniku"
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+msgid "Memo information"
+msgstr "Podaci o beleški"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:909
+#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
 msgid "Free/Busy information"
 msgstr "Slobodno/zauzeto podatak"
 
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:700
 msgid "Calendar information"
 msgstr "Podatak o kalendaru"
 
-#: ../calendar/gui/itip-utils.c:821
+#: ../calendar/gui/itip-utils.c:749
 msgid "Updated"
 msgstr "Osveženo"
 
-#: ../calendar/gui/itip-utils.c:829
+#: ../calendar/gui/itip-utils.c:757
 msgid "Refresh"
 msgstr "Osveži"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:761
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:905
+#: ../calendar/gui/itip-utils.c:833
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodno/zauzeto vreme (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:915
+#: ../calendar/gui/itip-utils.c:843
 msgid "iCalendar information"
 msgstr "iKalendar podatak"
 
-#: ../calendar/gui/itip-utils.c:1082
+#: ../calendar/gui/itip-utils.c:1010
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/memos-component.c:456
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:532
+#: ../calendar/gui/memos-component.c:540
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8245,7 +8239,7 @@ msgstr[0] "%d beleška"
 msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 
-#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
+#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8253,57 +8247,57 @@ msgstr[0] ", %d izabrano"
 msgstr[1] "%d izabrana"
 msgstr[2] "%d izabranih"
 
-#: ../calendar/gui/memos-component.c:581
+#: ../calendar/gui/memos-component.c:589
 msgid "Failed upgrading memos."
 msgstr "Neuspela dopuna beleški."
 
-#: ../calendar/gui/memos-component.c:879
+#: ../calendar/gui/memos-component.c:897
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Nije moguće otvaranje spiska beleški „%s“ za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:910
 msgid "There is no calendar available for creating memos"
 msgstr "Nijedan kalendar nije dostupan za pravljenje beleški"
 
-#: ../calendar/gui/memos-component.c:988
+#: ../calendar/gui/memos-component.c:1006
 msgid "Memo Source Selector"
 msgstr "Birač izvora beleški"
 
-#: ../calendar/gui/memos-component.c:1171
+#: ../calendar/gui/memos-component.c:1189
 msgid "New memo"
 msgstr "Nova beleška"
 
-#: ../calendar/gui/memos-component.c:1172
+#: ../calendar/gui/memos-component.c:1190
 msgid "Mem_o"
 msgstr "_Beleška"
 
-#: ../calendar/gui/memos-component.c:1173
+#: ../calendar/gui/memos-component.c:1191
 msgid "Create a new memo"
 msgstr "Napiši jednu novu belešku"
 
-#: ../calendar/gui/memos-component.c:1179
+#: ../calendar/gui/memos-component.c:1197
 msgid "New shared memo"
 msgstr "Nova deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1198
 msgid "_Shared memo"
 msgstr "_Deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1181
+#: ../calendar/gui/memos-component.c:1199
 msgid "Create a shared new memo"
 msgstr "Napravi nobu deljenu belešku"
 
-#: ../calendar/gui/memos-component.c:1187
+#: ../calendar/gui/memos-component.c:1205
 msgid "New memo list"
 msgstr "Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:1188
+#: ../calendar/gui/memos-component.c:1206
 msgid "Memo li_st"
 msgstr "Spi_sak beleški"
 
-#: ../calendar/gui/memos-component.c:1189
+#: ../calendar/gui/memos-component.c:1207
 msgid "Create a new memo list"
 msgstr "Sastavi novi spisak beleški"
 
@@ -8353,9 +8347,9 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Nije moguć prenos zaduženja ’%s‘"
 
 #: ../calendar/gui/migration.c:1226
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:398
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:429
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:542
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
 msgid "Notes"
 msgstr "Napomene"
 
@@ -8556,15 +8550,14 @@ msgstr "Kontakti: "
 
 #. TODO Allow the user to customize the title.
 #: ../calendar/gui/print.c:2524
-#, fuzzy
 msgid "Upcoming Appointments"
-msgstr "_Otvori sastanak"
+msgstr "Nastupajući sastanci"
 
-#: ../calendar/gui/tasks-component.c:447
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "No_vi spisak zaduženja"
 
-#: ../calendar/gui/tasks-component.c:523
+#: ../calendar/gui/tasks-component.c:531
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8572,57 +8565,57 @@ msgstr[0] "%d zaduženje"
 msgstr[1] "%d zaduženja"
 msgstr[2] "%d zaduženja"
 
-#: ../calendar/gui/tasks-component.c:572
+#: ../calendar/gui/tasks-component.c:580
 msgid "Failed upgrading tasks."
 msgstr "Neuspela dopuna zaduženja."
 
-#: ../calendar/gui/tasks-component.c:883
+#: ../calendar/gui/tasks-component.c:891
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Nije moguće otvaranje liste zaduženja ’%s‘ za pravljenje događaja i sastanaka"
 
-#: ../calendar/gui/tasks-component.c:896
+#: ../calendar/gui/tasks-component.c:904
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za pravljenje zaduženja"
 
-#: ../calendar/gui/tasks-component.c:993
+#: ../calendar/gui/tasks-component.c:1001
 msgid "Task Source Selector"
 msgstr "Birač izvora zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1257
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1251
+#: ../calendar/gui/tasks-component.c:1259
 msgid "Create a new task"
 msgstr "Napravi novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1265
 msgid "New assigned task"
 msgstr "Novo dodeljeno zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Assigne_d Task"
 msgstr "_Dodeljeno zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1259
+#: ../calendar/gui/tasks-component.c:1267
 msgid "Create a new assigned task"
 msgstr "Dodeli novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1265
+#: ../calendar/gui/tasks-component.c:1273
 msgid "New task list"
 msgstr "Nova lista zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1266
+#: ../calendar/gui/tasks-component.c:1274
 msgid "Tas_k list"
 msgstr "_Lista zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1267
+#: ../calendar/gui/tasks-component.c:1275
 msgid "Create a new task list"
 msgstr "Sastavi novu listu zaduženja"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8634,11 +8627,11 @@ msgstr ""
 "\n"
 "Zaista obrisati ova zaduženja?"
 
-#: ../calendar/gui/tasks-control.c:441
+#: ../calendar/gui/tasks-control.c:445
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Štampaj zaduženja"
 
@@ -10308,14 +10301,14 @@ msgstr "Pri_loži"
 msgid "Insert Attachment"
 msgstr "Umetni prilog"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljen sertifikat za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:841
+#: ../composer/e-msg-composer.c:842
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10323,52 +10316,52 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljen sertifikat za "
 "šifrovanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1344 ../composer/e-msg-composer.c:2606
+#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2614
 msgid "Hide _Attachment Bar"
 msgstr "Sakrij li_niju priloga"
 
-#: ../composer/e-msg-composer.c:1347 ../composer/e-msg-composer.c:2609
-#: ../composer/e-msg-composer.c:3987
+#: ../composer/e-msg-composer.c:1354 ../composer/e-msg-composer.c:2617
+#: ../composer/e-msg-composer.c:3985
 msgid "Show _Attachment Bar"
 msgstr "Prikaži lini_ju priloga"
 
-#: ../composer/e-msg-composer.c:1379 ../composer/e-msg-composer.c:1413
+#: ../composer/e-msg-composer.c:1386 ../composer/e-msg-composer.c:1420
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../composer/e-msg-composer.c:1451
+#: ../composer/e-msg-composer.c:1458
 msgid "Could not open file"
 msgstr "Nije moguće otvaranje datoteke"
 
-#: ../composer/e-msg-composer.c:1459
+#: ../composer/e-msg-composer.c:1466
 msgid "Unable to retrieve message from editor"
 msgstr "Nije moguće vratiti poruku iz uređivača"
 
-#: ../composer/e-msg-composer.c:1744
+#: ../composer/e-msg-composer.c:1751
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1779
+#: ../composer/e-msg-composer.c:1787
 msgid "Open File"
 msgstr "Otvara datoteku"
 
-#: ../composer/e-msg-composer.c:2241 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2249 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
-#: ../composer/e-msg-composer.c:2344
+#: ../composer/e-msg-composer.c:2352
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-msg-composer.c:2620 ../composer/e-msg-composer.c:3869
-#: ../composer/e-msg-composer.c:3872
+#: ../composer/e-msg-composer.c:2628 ../composer/e-msg-composer.c:3867
+#: ../composer/e-msg-composer.c:3870
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:5097
+#: ../composer/e-msg-composer.c:5125
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10531,14 +10524,14 @@ msgstr "Sač_uvaj poruku"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:510
+#: ../shell/main.c:512
 msgid "Evolution"
 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-commands.c:593
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
 msgid "Groupware Suite"
 msgstr "Pošaljite elektronsku poštu prijateljima i poslovnim saradnicima"
 
@@ -10577,18 +10570,18 @@ msgstr "Upit Evolucije"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Unutrašnja greška, zahtevana je nepoznata greška „%s“"
 
-#: ../e-util/e-print.c:136
+#: ../e-util/e-print.c:138
 msgid "An error occurred while printing"
-msgstr ""
+msgstr "Došlo je do greške u štampi"
 
-#: ../e-util/e-print.c:143
+#: ../e-util/e-print.c:145
 msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "Sistem za štampanje je izvestio sledeće detalje o greški:"
 
-#: ../e-util/e-print.c:149
+#: ../e-util/e-print.c:151
 msgid ""
 "The printing system did not report any additional details about the error."
-msgstr ""
+msgstr "Sistem za štampanje nije ponudio nikakve dodatne detalje o greški."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10610,7 +10603,7 @@ msgstr "Datoteka postoji &quot;{0}&quot;."
 msgid "Overwrite file?"
 msgstr "Prepisati datoteku?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
@@ -10626,9 +10619,9 @@ msgstr[2] "pre %d sekundi"
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 sekunda u budućnosti"
+msgstr[1] "%d sekunde u budućnosti"
+msgstr[2] "%d sekundi u budućnosti"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
@@ -10642,9 +10635,9 @@ msgstr[2] "pre %d minuta"
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 minut u budućnosti"
+msgstr[1] "%d minuta u budućnosti"
+msgstr[2] "%d minuta u budućnosti"
 
 #: ../filter/filter-datespec.c:82
 #, c-format
@@ -10658,9 +10651,9 @@ msgstr[2] "pre %d sati"
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 sat u budućnosti"
+msgstr[1] "%d sata u budućnosti"
+msgstr[2] "%d sati u budućnosti"
 
 #: ../filter/filter-datespec.c:83
 #, c-format
@@ -10671,12 +10664,12 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 
 #: ../filter/filter-datespec.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "U kancelariji sam"
-msgstr[1] "U kancelariji sam"
-msgstr[2] "U kancelariji sam"
+msgstr[0] "1 dan u budućnosti"
+msgstr[1] "%d dana u budućnosti"
+msgstr[2] "%d dana u budućnosti"
 
 #: ../filter/filter-datespec.c:84
 #, c-format
@@ -10690,9 +10683,9 @@ msgstr[2] "pre %d nedelja"
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 nedelja u budućnosti"
+msgstr[1] "%d nedelje u budućnosti"
+msgstr[2] "%d nedelja u budućnosti"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
@@ -10703,12 +10696,12 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 
 #: ../filter/filter-datespec.c:85
-#, fuzzy, c-format
+#, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "U kancelariji sam"
-msgstr[1] "U kancelariji sam"
-msgstr[2] "U kancelariji sam"
+msgstr[0] "1 mesec u budućnosti"
+msgstr[1] "%d months in the future"
+msgstr[2] "%d months in the future"
 
 #: ../filter/filter-datespec.c:86
 #, c-format
@@ -10719,12 +10712,12 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 
 #: ../filter/filter-datespec.c:86
-#, fuzzy, c-format
+#, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "U kancelariji sam"
-msgstr[1] "U kancelariji sam"
-msgstr[2] "U kancelariji sam"
+msgstr[0] "1 godina u budućnosti"
+msgstr[1] "%d godine u budućnosti"
+msgstr[2] "%d godina u budućnosti"
 
 #: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
@@ -10749,19 +10742,19 @@ msgid "Choose a file"
 msgstr "Izaberite datoteku"
 
 #: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
 #: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
 #: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Kasnije"
 
@@ -10806,9 +10799,8 @@ msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
 #: ../filter/filter-rule.c:893
-#, fuzzy
 msgid "I_nclude threads"
-msgstr "Uključi niti"
+msgstr "U_ključi niti"
 
 #: ../filter/filter-rule.c:989 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:307
@@ -10840,7 +10832,7 @@ msgid "Missing file name."
 msgstr "Nedostaje ime datoteke."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -10911,14 +10903,14 @@ msgstr "pre"
 
 #: ../filter/filter.glade.h:16
 msgid "in the future"
-msgstr ""
+msgstr "u budućnosti"
 
 #: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:186
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
 msgid "seconds"
 msgstr "sekunde"
 
@@ -10930,7 +10922,7 @@ msgstr "trenutno vreme"
 msgid "the time you specify"
 msgstr "vreme koje odredite"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "weeks"
 msgstr "nedelje"
@@ -10993,21 +10985,21 @@ msgid "Evolution Mail preferences control"
 msgstr "Kontrola postavki Evolucija pošte"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:529
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:605
 #: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:569 ../mail/mail-component.c:570
-#: ../mail/mail-component.c:725
+#: ../mail/mail-component.c:568 ../mail/mail-component.c:569
+#: ../mail/mail-component.c:726
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:535
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
@@ -11034,7 +11026,7 @@ msgstr ""
 "i označite kućicu da bi ga prihvatili\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:510
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Izaberite fasciklu"
 
@@ -11042,83 +11034,82 @@ msgstr "Izaberite fasciklu"
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: ../mail/em-account-editor.c:2046
+#: ../mail/em-account-editor.c:2056
 msgid "Automatically check for _new mail every"
 msgstr "_Automatski proveri za _novu poštu svakih"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:133
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
 msgid "Defaults"
 msgstr "Podrazumevano"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2362 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sigurnost"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
+#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
 msgid "Checking for New Mail"
 msgstr "Provera za nove poruke"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:81
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolucija naloga"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-#, fuzzy
+#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
+#: ../mail/em-account-prefs.c:412
 msgid "Di_sable"
-msgstr "Onemogući"
+msgstr "I_sključi"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411 ../mail/mail-config.glade.h:75
+#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
+#: ../mail/em-account-prefs.c:414 ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "O_mogući"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:469
 msgid "[Default]"
 msgstr "[Podrazumevano]"
 
 # has "activatable" set.
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:949
-#: ../plugins/plugin-manager/plugin-manager.c:261
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:949
+#: ../plugins/plugin-manager/plugin-manager.c:284
+#: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:528
 msgid "Account name"
 msgstr "Ime naloga"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:530
 msgid "Protocol"
 msgstr "Protokol"
 
 #: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
-#: ../mail/mail-config.c:1029
+#: ../mail/mail-config.c:181 ../mail/mail-config.c:1036
 msgid "Unnamed"
 msgstr "Bez imena"
 
@@ -11134,7 +11125,7 @@ msgstr "Dodaj skriptu za potpis"
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:396
+#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
@@ -11156,9 +11147,8 @@ msgstr ""
 "${TimeZone}, ${Sender} piše:"
 
 #: ../mail/em-composer-utils.c:1880
-#, fuzzy
 msgid "-----Original Message-----"
-msgstr "-------- Prosleđena poruka --------"
+msgstr "-----Originalna poruka-----"
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
@@ -11297,7 +11287,7 @@ msgstr "nije"
 msgid "is not Flagged"
 msgstr "nije označeno"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:95
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
@@ -11414,8 +11404,8 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1674
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:854
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1691
+#: ../mail/em-format-quote.c:320 ../mail/em-format.c:859
 #: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:6
@@ -11429,54 +11419,54 @@ msgstr "Nepostavljen status"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>Onda</b>"
+msgid "Then"
+msgstr "Potom"
 
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:186
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:208
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:209
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:211
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:218
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:219
 msgid "Recent Messages"
 msgstr "Skorašnje poruke"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:220
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:221
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:222
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:223
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../mail/em-folder-browser.c:1025
+#: ../mail/em-folder-browser.c:1041
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../mail/em-folder-browser.c:1069
+#: ../mail/em-folder-browser.c:1085
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
@@ -11508,16 +11498,16 @@ msgstr "Osobine fascikle"
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:262
 msgid "Create"
 msgstr "Napravi"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "_Ime fascikle:"
 
 #: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#: ../mail/mail-vfolder.c:931 ../mail/mail-vfolder.c:1004
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
 
@@ -11531,8 +11521,9 @@ msgid "Drafts"
 msgstr "Priprema"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2462
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2552
 #: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Sanduče"
@@ -11597,20 +11588,20 @@ msgstr "Umnožavanje poruka u fasciklu %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nije moguće ubaciti poruku(e) u ostavu na najvišem nivou"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:986 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Umnoži u fasciklu"
 
-#: ../mail/em-folder-tree.c:1005 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:987 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Premesti u fasciklu"
 
-#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1697 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretraga fascikli u „%s“"
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2097 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
@@ -11618,137 +11609,135 @@ msgstr "Pretraga fascikli u „%s“"
 msgid "_View"
 msgstr "P_regled"
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2098
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2102
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2103
 msgid "_Move..."
 msgstr "_Premesti..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2120
+#: ../mail/em-folder-tree.c:2107
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../mail/em-folder-tree.c:2124
-#, fuzzy
+#: ../mail/em-folder-tree.c:2111
 msgid "Re_fresh"
-msgstr "Osveži"
+msgstr "O_sveži"
 
-#: ../mail/em-folder-tree.c:2125
-#, fuzzy
+#: ../mail/em-folder-tree.c:2112
 msgid "Fl_ush Outbox"
-msgstr "Za slanje"
+msgstr "Is_prazni Za slanje"
 
-#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:136
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:135
 msgid "_Empty Trash"
 msgstr "Isprazni _smeće"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:105
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Umnožavanje ’%s‘ u ’%s‘"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1038
-#: ../mail/em-folder-view.c:1053
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1114
+#: ../mail/em-folder-view.c:1129
 #: ../mail/importers/evolution-mbox-importer.c:86
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1053
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1129
 msgid "C_opy"
 msgstr "_Umnoži"
 
-#: ../mail/em-folder-utils.c:581
+#: ../mail/em-folder-utils.c:590
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravljenje fascikle ’%s‘"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-folder-view.c:974 ../mail/mail.error.xml.h:68
+#: ../mail/em-folder-view.c:1050 ../mail/mail.error.xml.h:68
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../mail/em-folder-view.c:975 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-view.c:1051 ../mail/mail.error.xml.h:123
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemate dovoljna ovlašćenja da obrišete ovu poštu."
 
-#: ../mail/em-folder-view.c:1146 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1222 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/em-folder-view.c:1148 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../mail/em-folder-view.c:1224 ../mail/em-popup.c:574 ../mail/em-popup.c:585
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Prosl_edi"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1152 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1228 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1234
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1235
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1236
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/em-folder-view.c:1163
+#: ../mail/em-folder-view.c:1239
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/em-folder-view.c:1164
+#: ../mail/em-folder-view.c:1240
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/em-folder-view.c:1165
+#: ../mail/em-folder-view.c:1241
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/em-folder-view.c:1166
+#: ../mail/em-folder-view.c:1242
 msgid "Mark as Un_important"
 msgstr "_Označi kao nevažno"
 
-#: ../mail/em-folder-view.c:1167
+#: ../mail/em-folder-view.c:1243
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1244
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1245
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/em-folder-view.c:1171
+#: ../mail/em-folder-view.c:1247
 msgid "_Label"
 msgstr "Nat_pis"
 
@@ -11759,95 +11748,94 @@ msgstr "Nat_pis"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1172 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1248 ../widgets/misc/e-dateedit.c:473
 msgid "_None"
 msgstr "Ništ_a"
 
-#: ../mail/em-folder-view.c:1177
+#: ../mail/em-folder-view.c:1253
 msgid "Fla_g Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/em-folder-view.c:1178
+#: ../mail/em-folder-view.c:1254
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1257
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1258
 msgid "Search Folder from _Subject"
 msgstr "Fascikla pretrage na _naslov"
 
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1259
 msgid "Search Folder from Se_nder"
 msgstr "Fascikla pretrage na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1184
+#: ../mail/em-folder-view.c:1260
 msgid "Search Folder from _Recipients"
 msgstr "Fascikla pretrage na _primaoce"
 
-#: ../mail/em-folder-view.c:1185
+#: ../mail/em-folder-view.c:1261
 msgid "Search Folder from Mailing _List"
 msgstr "Fascikla pretrage na dopisnu _listu"
 
-#: ../mail/em-folder-view.c:1189
+#: ../mail/em-folder-view.c:1265
 msgid "Filter on Sub_ject"
 msgstr "Filter na naslo_v"
 
-#: ../mail/em-folder-view.c:1190
+#: ../mail/em-folder-view.c:1266
 msgid "Filter on Sen_der"
 msgstr "Filter na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1191
+#: ../mail/em-folder-view.c:1267
 msgid "Filter on Re_cipients"
 msgstr "Filter na p_rimaoce"
 
-#: ../mail/em-folder-view.c:1192
+#: ../mail/em-folder-view.c:1268
 msgid "Filter on _Mailing List"
 msgstr "Filter na _dopisnu listu"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2099 ../mail/em-folder-view.c:2143
+#: ../mail/em-folder-view.c:2098 ../mail/em-folder-view.c:2142
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../mail/em-folder-view.c:2356
+#: ../mail/em-folder-view.c:2355
 msgid "Unable to retrieve message"
 msgstr "Nije moguće dobiti poruku"
 
-#: ../mail/em-folder-view.c:2377
-#, fuzzy
-msgid "<b>Retrieving Message...</b>"
-msgstr "Dovlačenje poruke %s"
+#: ../mail/em-folder-view.c:2374
+msgid "Retrieving Message..."
+msgstr "Dovlačenje poruke..."
 
-#: ../mail/em-folder-view.c:2601
+#: ../mail/em-folder-view.c:2602
 msgid "C_all To..."
-msgstr ""
+msgstr "P_oziv za..."
 
-#: ../mail/em-folder-view.c:2604
+#: ../mail/em-folder-view.c:2605
 msgid "Create _Search Folder"
 msgstr "Napravi Fasciklu _pretrage"
 
-#: ../mail/em-folder-view.c:2605
+#: ../mail/em-folder-view.c:2606
 msgid "_From this Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/em-folder-view.c:2606
+#: ../mail/em-folder-view.c:2607
 msgid "_To this Address"
 msgstr "_na ovu adresu"
 
-#: ../mail/em-folder-view.c:2981
+#: ../mail/em-folder-view.c:2982
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: ../mail/em-folder-view.c:2993
-#, fuzzy, c-format
+#: ../mail/em-folder-view.c:2994
+#, c-format
 msgid "Click to call %s"
-msgstr "Kliknite da pošaljete %s"
+msgstr "Kliknite da pozovete %s"
 
-#: ../mail/em-folder-view.c:2998
+#: ../mail/em-folder-view.c:2999
 msgid "Click to hide/unhide addresses"
 msgstr "Pritisni da sakriješ/otkirješ adresu"
 
@@ -11875,7 +11863,7 @@ msgstr "_Sledeće"
 msgid "M_atch case"
 msgstr "_Podudaraj veliko/malo slovo"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:632
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:635
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
@@ -11885,7 +11873,7 @@ msgid ""
 "authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka autentična."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:633
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:636
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
@@ -11897,7 +11885,7 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno autentičan."
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:634
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:637
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
@@ -11908,9 +11896,9 @@ msgid ""
 msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: ../mail/em-format-html-display.c:941
-msgid "Valid signature, cannot verify sender"
-msgstr "Ispravan potpis, nije moguća provera pošiljaoca"
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:638
+msgid "Valid signature, but cannot verify sender"
+msgstr "Ispravan potpis, ali nije moguća provera pošiljaoca"
 
 #: ../mail/em-format-html-display.c:941
 msgid ""
@@ -11920,11 +11908,21 @@ msgstr ""
 "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
 "biti proveren."
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:639
+msgid "Signature exists, but need public key"
+msgstr "Potpis postoji, ali traži javni ključ"
+
+#: ../mail/em-format-html-display.c:942
+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:949 ../mail/em-format-html.c:645
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11932,11 +11930,11 @@ msgstr ""
 "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti u prenosu preko "
 "Interneta."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:646
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:950
 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 "
@@ -11945,22 +11943,22 @@ 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:949 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:647
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:951
 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:950 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:648
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:952
 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 "
@@ -11969,63 +11967,61 @@ msgstr ""
 "Ova poruka je šifrovana — i to jakim algoritmom.  Veoma je teško da neko sa "
 "strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../mail/em-format-html-display.c:1051 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Pre_gledaj sertifikat"
 
-#: ../mail/em-format-html-display.c:1066
+#: ../mail/em-format-html-display.c:1068
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat nije čitljiv"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1387
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno u %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1393
+#: ../mail/em-format-html-display.c:1395
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: ../mail/em-format-html-display.c:1396
+#: ../mail/em-format-html-display.c:1398
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1458
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1459
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1460
 msgid "_Fit to Width"
 msgstr "_Prilagodi na širinu"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1461
 msgid "Show _Original Size"
 msgstr "Prikaži _originalnu veličinu"
 
-#: ../mail/em-format-html-display.c:1903 ../mail/em-format-html-display.c:2514
+#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2518
 #: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Prilog"
 
-#: ../mail/em-format-html-display.c:2117
-#, fuzzy
+#: ../mail/em-format-html-display.c:2119
 msgid "Save attachment as"
-msgstr "Sačuvaj priloge"
+msgstr "Sačuvaj prilog kao"
 
-#: ../mail/em-format-html-display.c:2121
-#, fuzzy
+#: ../mail/em-format-html-display.c:2123
 msgid "Select folder to save all attachments"
-msgstr "Izaberite fasciklu za čuvanje svih priloga..."
+msgstr "Izaberite fasciklu za čuvanje svih priloga"
 
-#: ../mail/em-format-html-display.c:2172
+#: ../mail/em-format-html-display.c:2174
 msgid "_Save Selected..."
 msgstr "Izabrano čuvanje..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2241
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12033,31 +12029,31 @@ msgstr[0] "%d pri_log"
 msgstr[1] "%d pri_loga"
 msgstr[2] "%d pri_loga"
 
-#: ../mail/em-format-html-display.c:2246 ../mail/em-format-html-display.c:2324
+#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
 msgid "S_ave"
 msgstr "_Sačuvaj"
 
-#: ../mail/em-format-html-display.c:2257
+#: ../mail/em-format-html-display.c:2259
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../mail/em-format-html-display.c:2320
+#: ../mail/em-format-html-display.c:2322
 msgid "No Attachment"
 msgstr "Nema priloga"
 
-#: ../mail/em-format-html-display.c:2451 ../mail/em-format-html-display.c:2487
+#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2491
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:2453
+#: ../mail/em-format-html-display.c:2455
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:2506
+#: ../mail/em-format-html-display.c:2510
 msgid "O_pen With"
 msgstr "O_tvori pomoću"
 
-#: ../mail/em-format-html-display.c:2577
+#: ../mail/em-format-html-display.c:2581
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -12070,145 +12066,157 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%d. strana od %d"
 
-#: ../mail/em-format-html.c:486 ../mail/em-format-html.c:495
+#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Dovlačenje ’%s‘"
 
-#: ../mail/em-format-html.c:635
-msgid "Valid signature but cannot verify sender"
-msgstr "Ispravan potpis ali nije moguća provera pošiljaoca"
+#: ../mail/em-format-html.c:910
+msgid "Unknown external-body part."
+msgstr "Nepoznat spoljni deo poruke."
 
-#: ../mail/em-format-html.c:906
+#: ../mail/em-format-html.c:918
 msgid "Malformed external-body part."
 msgstr "Loše složen spoljni deo poruke."
 
-#: ../mail/em-format-html.c:936
+#: ../mail/em-format-html.c:948
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP stranicu (%s)"
 
-#: ../mail/em-format-html.c:947
+#: ../mail/em-format-html.c:959
 #, 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:949
+#: ../mail/em-format-html.c:961
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
-#: ../mail/em-format-html.c:970
+#: ../mail/em-format-html.c:982
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežni podatak (%s)"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:993
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
 
-#: ../mail/em-format-html.c:1208
+#: ../mail/em-format-html.c:1220
 msgid "Formatting message"
 msgstr "Oblikovanje poruke"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1388
+msgid "Formatting Message..."
+msgstr "Oblikovanje poruke..."
+
+#: ../mail/em-format-html.c:1520 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Šalje"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1520 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:88
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1520 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html.c:1599 ../mail/em-format-html.c:1621
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:857
+#: ../mail/em-mailer-prefs.c:90
 msgid "Cc"
 msgstr "Kopija (Cc)"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1520 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html.c:1605 ../mail/em-format-html.c:1624
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:858
+#: ../mail/em-mailer-prefs.c:91
 msgid "Bcc"
 msgstr "Nevidljiva kopija (Bcc)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1678 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1182
+#: ../mail/em-format-html.c:1695 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1198
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1705
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1722
+msgid " (%a, %R %Z)"
+msgstr "(%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1708
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
+#: ../mail/em-format-html.c:1727
+msgid " (%R %Z)"
+msgstr "(%R %Z)"
 
-#: ../mail/em-format-html.c:1718 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1739 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:860 ../mail/em-mailer-prefs.c:93
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Datum"
 
-#: ../mail/em-format-html.c:1741 ../mail/em-format.c:856
+#: ../mail/em-format-html.c:1762 ../mail/em-format.c:861
 #: ../mail/em-mailer-prefs.c:94
 msgid "Newsgroups"
 msgstr "Grupe za vesti"
 
-#: ../mail/em-format.c:1120
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1852
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr "Poruku šalje <b>%s</b> u ime <b>%s</b>"
+
+#: ../mail/em-format.c:1125
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../mail/em-format.c:1159
+#: ../mail/em-format.c:1164
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
 
-#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
+#: ../mail/em-format.c:1301 ../mail/em-format.c:1457
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nije moguća obrada MIME poruke. Prikazivanje izvora."
 
-#: ../mail/em-format.c:1300
+#: ../mail/em-format.c:1309
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržani tip šifre za multipart/encrypted"
 
-#: ../mail/em-format.c:1310
-#, fuzzy
+#: ../mail/em-format.c:1319
 msgid "Could not parse PGP/MIME message"
-msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
+msgstr "Nije moguća obrada PGP/MIME poruke"
 
-#: ../mail/em-format.c:1310
-#, fuzzy
+#: ../mail/em-format.c:1319
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
+msgstr "Nije moguća obrada PGP/MIME poruke: nepoznata greška"
 
-#: ../mail/em-format.c:1467
+#: ../mail/em-format.c:1476
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+#: ../mail/em-format.c:1484 ../mail/em-format.c:1555
 msgid "Error verifying signature"
 msgstr "Greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+#: ../mail/em-format.c:1484 ../mail/em-format.c:1546 ../mail/em-format.c:1555
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1612
-#, fuzzy
+#: ../mail/em-format.c:1626
 msgid "Could not parse PGP message"
-msgstr "Nije moguće pravljenje poruke."
+msgstr "Nije moguća obrada PGP poruke."
 
-#: ../mail/em-format.c:1612
-#, fuzzy
+#: ../mail/em-format.c:1626
 msgid "Could not parse PGP message: Unknown error"
-msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
+msgstr "Nije moguća obrada PGP/MIME poruke: nepoznata greška"
 
 # bug: requires a comment on usage
 # slično kao za mesece i nedelje
@@ -12231,21 +12239,22 @@ msgstr "jednom nedeljno"
 msgid "Once per month"
 msgstr "jednom mesečno"
 
-#: ../mail/em-mailer-prefs.c:777
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:789 ../mail/em-mailer-prefs.c:843
 #, c-format
 msgid "%s plugin is available and the binary is installed."
-msgstr ""
+msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
 
-#: ../mail/em-mailer-prefs.c:785
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:797 ../mail/em-mailer-prefs.c:852
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
-msgstr ""
+msgstr "Dodatak %s nije dostupan. Proverite da li je paket instaliran."
 
-#: ../mail/em-mailer-prefs.c:806
-#, fuzzy
+#: ../mail/em-mailer-prefs.c:818
 msgid "No Junk plugin available"
-msgstr "Nema dostupnog opisa."
+msgstr "Nema dostupnog dodatka za đubre"
 
 #: ../mail/em-migrate.c:1211
 msgid ""
@@ -12295,12 +12304,12 @@ msgstr "Nije moguće umnožavanje POP3 čuvaj-na-serveru podatka ’%s‘: %s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nije uspelo pravljenje lokalne ostave pošte ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2710
+#: ../mail/em-migrate.c:2743
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nije moguće pravljenje lokalnih fascikli pošte u ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2729
+#: ../mail/em-migrate.c:2762
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12308,16 +12317,16 @@ msgstr ""
 "Nije moguće čitanje podešavanja prethodne instalacije Evolucije, ’evolution/"
 "config.xmldb‘ ne postoji ili je oštećen."
 
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../mail/em-popup.c:570 ../mail/em-popup.c:581
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-popup.c:571 ../mail/em-popup.c:582
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/em-popup.c:632
+#: ../mail/em-popup.c:635
 msgid "_Add to Address Book"
 msgstr "Dodaj u _imenik"
 
@@ -12334,11 +12343,11 @@ msgid "Folder"
 msgstr "Fascikla"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "Izaberite server."
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:858
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
@@ -12354,16 +12363,16 @@ msgstr "Propusni_ci poruka"
 msgid "message"
 msgstr "poruka"
 
-#: ../mail/em-utils.c:559
+#: ../mail/em-utils.c:563
 msgid "Save Message..."
 msgstr "Sačuvaj poruku..."
 
-#: ../mail/em-utils.c:608
+#: ../mail/em-utils.c:612
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1092
+#: ../mail/em-utils.c:1096
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -12372,7 +12381,7 @@ msgstr "Poruke od %s"
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-rule.c:590
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Izvor fas_cikle pretrage"
 
@@ -12457,9 +12466,8 @@ msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
 #: ../mail/evolution-mail.schemas.in.h:20
-#, fuzzy
 msgid "Default value for thread expand state"
-msgstr "Podrazumevan naslov poruke."
+msgstr "Podrazumevana vrednost za rašireni niz"
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default width of the Composer Window"
@@ -12482,18 +12490,16 @@ msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtava oznake greški pri kucanju uz reči dok kucate."
 
 #: ../mail/evolution-mail.schemas.in.h:26
-#, fuzzy
 msgid "Empty Junk folders on exit"
-msgstr "Prazni fascikle sa smećem na izlazu"
+msgstr "Prazni fascikle sa đubretom pri izlazu"
 
 #: ../mail/evolution-mail.schemas.in.h:27
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
 #: ../mail/evolution-mail.schemas.in.h:28
-#, fuzzy
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Prazni sve fascikle sa smećem pri zatvaranju Evolucije."
+msgstr "Prazni sve fascikle sa đubretom pri zatvaranju Evolucije."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Empty all Trash folders when exiting Evolution."
@@ -12537,6 +12543,10 @@ msgid "Height of the message-list pane."
 msgstr "Visina površi liste poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:37
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Skriva pregled po fasciklama i uklanja izbor"
+
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12544,7 +12554,7 @@ msgstr ""
 "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pita ga da li "
 "zaista želi to da uradi."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12552,7 +12562,7 @@ msgstr ""
 "Ako je „Pregled porkue“ površ uključena, onda pokažite je jednu do druge "
 "radije nego uspravno."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 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 "
@@ -12562,38 +12572,39 @@ msgstr ""
 "mime tipovi sa ove liste koji su vezani bonobo pregledačem delova u Gnomovoj "
 "bazi mime tipova mogu biti korišćeni za prikaz sadržaja."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "It disables the feature where repeated prompts to ask if offline sync is "
 "required."
 msgstr ""
+"Isključuje svojstvo gde su potrebni višestruki upiti za neophodnost "
+"sinhronizacije van mreže."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "To uključuje/isključuje upozorenje kada označavate više poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:42
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Last time empty junk was run"
-msgstr "Poslednje vreme pražnjenja smeća"
+msgstr "Poslednje vreme pražnjenja đubreta"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Last time empty trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "List of Labels and their associated colors"
 msgstr "Lista oznaka i njima dodeljenih boja"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "List of accepted licenses"
 msgstr "Lista prihvaćenih licenci"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "List of accounts"
 msgstr "Lista naloga"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12601,11 +12612,11 @@ msgstr ""
 "Lista naloga koje poznaje poštanski deo Evolucije. Lista sadrži nizove koje "
 "imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista prilagođenih zaglavlja i da li su uključena."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 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."
@@ -12613,19 +12624,19 @@ msgstr ""
 "Lista oznaka koje poznaje poštanski deo Evolucije. Lista sadrži nizove "
 "oblika ime:boja gde boja koristi HTML hex kodiranje."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista mime tipova radi provere za bonobo pregledačima"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista imena protokola čija je licenca prihvaćena."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Load images for HTML messages over http"
 msgstr "Učitava slike za HTML poruke preko http-a"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12635,110 +12646,108 @@ msgstr ""
 "Nikada ne učitavaj slike sa mreže 1. - Učitavaj slike ukoliko je pošiljalac u "
 "imeniku 2 - Uvek učitavaj slike sa mreže"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Log filter actions"
 msgstr "Beleži radnje filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava kao viđenu posle navedenog roka"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava kao viđenu posle navedenog roka."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Message Window default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Message Window default width"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil prikaza poruke ( „normalan“, „sva zaglavlja“, „izvor“)"
 
-#: ../mail/evolution-mail.schemas.in.h:65
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Minimum days between emptying the junk on exit"
-msgstr "Najmanje dana između pražnjenja smeća na izlazu"
+msgstr "Najmanje dana između pražnjenja đubreta na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
+msgstr "Najmanje vreme između pražnjenja đubreta na izlazu, u danima."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obaveštenje o novoj pošti"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "New Mail Notify type"
 msgstr "Tip obaveštenja o novoj pošti"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Broj adresa za prikaz u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Prompt on empty subject"
 msgstr "Pita kada je naslov prazan"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pita korisnika kada pokuša da isprazni fasciklu."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pita korisnika kada pokuša da pošalje poruku bez naslova."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr ""
+msgstr "Traži proveru da li korisnik želi odmah da se iskljući sa mreže"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Prompt when user expunges"
 msgstr "Pita pri pražnjenju"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Prompt when user only fills Bcc"
 msgstr "Pita kada korisnik unese samo nevidljivu kopiju (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pita korisnika kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12746,132 +12755,130 @@ msgstr ""
 "Pita kada korisnik pokuša da pošalje HTML poruku primaocima koji možda ne "
 "žele da primaju HTML poštu."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pita korisnika kada pokuša da pošalje poruku bez primalaca."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pita kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Prompt while marking multiple messages"
 msgstr "Pita pri označavanju više poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaje smeške u tekstu i zamenjuje ih slikama."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Run junk test on incoming mail"
 msgstr "Proveri da li ima đubreta u dolaznoj pošti"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Save directory"
 msgstr "Sačuvaj direktorijum"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Search for the sender photo in local addressbooks"
-msgstr ""
+msgstr "Traži sliku korisnika u lokalnim adresarima"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji poštu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano šalje poštu kao HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Show photo of the sender"
-msgstr ""
+msgstr "Prikatuje sliku pošiljaoca"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
 "list"
 msgstr "Prikaži e-adresu pošiljaoca u složenoj koloni u spisku poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:98
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "Prikaži e-adresu pošiljaoca u složenoj koloni u spisku poruka"
+msgstr "Prikazuje sliku pošiljaoca u oknu za čitanje poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Show the sender email in the messages column in the message list"
 msgstr "Prikaži e-adresu pošiljaoca u koloni za poruke u spisku poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Sound file to play when new mail arrives."
 msgstr "Zvučna datoteka za puštanje kada stigne nova pošta."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Navodi tip obaveštenja o novoj pošti koje korisnik želi da koristi."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Spell check inline"
 msgstr "Provera pravopisa unutar"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Subscribe dialog default width"
 msgstr "Podrazumevana širina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Terminal font"
 msgstr "Slovni lik terminala"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Text message part limit"
 msgstr "Ograničenje tekstualnog dela poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "The default plugin for Junk hook"
-msgstr ""
+msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../mail/evolution-mail.schemas.in.h:108
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr "Vreme pražnjenja smeća, u danima od početka epohe."
+msgstr "Poslednje vreme pražnjenja đubreta, u danima od početka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Vreme pražnjenja smeća, u danima od početka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "The terminal font for mail display"
 msgstr "Slovni lik terminala za prikaz pošte"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "The variable width font for mail display"
 msgstr "Slovni lik promenljive veličine za prikaz pošte"
 
 # bug: s/interms/in terms/ (space)
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12879,14 +12886,25 @@ msgstr ""
 "Ovo određuje najveću veličinu tekstualnog dela koji se može iscrtati u "
 "Evoluciji. Podrazumeva se 4MB/4096 KB i navedeno je kao broj KB."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it wont fall back to "
-"the other available plugins."
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
 msgstr ""
+"Ovo je podrazumevani dodatak kuke za đubre, čak i ako su uključeni višestruki "
+"dodaci. Ukoliko je pomenuti podrazumevani dodatak isključen, preostali "
+"dostupni dodaci neće biti aktivirani."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"This key is read only once and reset to false after read. This unselects the "
+"mail in the list and removes the preview for that folder."
+msgstr ""
+"Ovak ključ je pročitan jednom i potom vraćen na lažno. Ovo uklanja izbor pošte "
+"sa spiska i pregled za tu fasciklu."
+
+#: ../mail/evolution-mail.schemas.in.h:116
 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;"
@@ -12897,11 +12915,11 @@ msgstr ""
 "zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header "
 "enabled&gt; - omogućeno za prikazivanje zaglavlja u pregledu pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "This option would help in improving the speed of fetching."
-msgstr ""
+msgstr "Ova će opcija pripomoći brzini pribavljanja pošte."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12909,111 +12927,111 @@ msgstr ""
 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
 "posle čega je „...“ prikazano."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart"
 msgstr ""
+"Ovo podešavanje određuje da li će nizovi biti podrazumevano rašireni ili "
+"skupljeni. Evolucija zahteva ponovno pokretanje"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Thread the message list."
 msgstr "Razvrstava spisak poruka po raspravama."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Thread the message-list"
 msgstr "Razvrstaj poruke po raspravama"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži poruke prema naslovu rasprave"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Timeout for marking message as Seen"
 msgstr "Vreme za označavanje poruka kao viđene"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Timeout for marking message as Seen."
 msgstr "Vreme za označavanje poruka kao viđene."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../mail/evolution-mail.schemas.in.h:124
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
-#: ../mail/evolution-mail.schemas.in.h:125
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Use SpamAssassin daemon and client (spamc/spamd)"
 msgstr "Koristi servis i klijenta Ubice spama (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Use custom fonts"
 msgstr "Koristi sopstveni slovni lik"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi sopstveni slovni lik za prikaz pošte"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Use side-by-side or wide layout"
 msgstr "Koristite jedan do drugog ili široki raspored"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Variable width font"
 msgstr "Slovni lik promenljive veličine"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "View/Bcc menu item is checked"
 msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "View/Bcc menu item is checked."
 msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "View/Cc menu item is checked"
 msgstr "Opcija Pregled/kopija (Cc) je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "View/Cc menu item is checked."
 msgstr "Opcija Pregled/kopija (Cc) je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "View/From menu item is checked"
 msgstr "Opcija Pregled/šalje je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "View/From menu item is checked."
 msgstr "Opcija Pregled/šalje je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "View/PostTo menu item is checked"
 msgstr "Opcija Pregled/prima je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "View/PostTo menu item is checked."
 msgstr "Opcija Pregled/pošalji je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "View/ReplyTo menu item is checked"
 msgstr "Opcija Pregled/odgovor je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "View/ReplyTo menu item is checked."
 msgstr "Opcija Pregled/odgovor je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13021,11 +13039,11 @@ msgstr ""
 "Da li pokušati prikaz niza rasprave po naslovu kada poruke ne sadrže "
 "zaglavlja „In-Reply-To“ ili „References“."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Width of the message-list pane"
 msgstr "Širina površi liste poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Width of the message-list pane."
 msgstr "Širina površi liste poruka."
 
@@ -13061,7 +13079,7 @@ msgstr "Uvoznik za fascikle oblika Berkli poštanskog sandučeta"
 msgid "Importing mailbox"
 msgstr "Uvoženje poštanskog sandučeta"
 
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvoženje ’%s‘"
@@ -13107,7 +13125,7 @@ msgstr "%s dopisna lista"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: ../mail/mail-component.c:531
+#: ../mail/mail-component.c:530
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13115,7 +13133,7 @@ msgstr[0] "%d obrisano"
 msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:532
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13123,7 +13141,7 @@ msgstr[0] "%d đubre"
 msgstr[1] "%d đubreta"
 msgstr[2] "%d đubreta"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:535
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13131,7 +13149,7 @@ msgstr[0] "%d u pripremi"
 msgstr[1] "%d u pripremi"
 msgstr[2] "%d u pripremi"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:537
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13139,7 +13157,7 @@ msgstr[0] "%d poslato"
 msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13147,15 +13165,15 @@ msgstr[0] "%d neposlato"
 msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 
-#: ../mail/mail-component.c:546
-#, fuzzy, c-format
+#: ../mail/mail-component.c:545
+#, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
-msgstr[0] ", %d nepročitano"
-msgstr[1] ", %d nepročitane"
-msgstr[2] ", %d nepročitanih"
+msgstr[0] "%d nepročitana,"
+msgstr[1] "%d nepročitane,"
+msgstr[2] "%d nepročitanih,"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13163,39 +13181,39 @@ msgstr[0] "%d ukupno"
 msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 
-#: ../mail/mail-component.c:551
-#, fuzzy, c-format
+#: ../mail/mail-component.c:550
+#, c-format
 msgid " %d selected, "
 msgid_plural " %d selected, "
-msgstr[0] ", %d izabrano"
-msgstr[1] "%d izabrana"
-msgstr[2] "%d izabranih"
+msgstr[0] "%d izabrana,"
+msgstr[1] "%d izabrane,"
+msgstr[2] "%d izabranih,"
 
-#: ../mail/mail-component.c:876
+#: ../mail/mail-component.c:877
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: ../mail/mail-component.c:877
+#: ../mail/mail-component.c:878
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../mail/mail-component.c:878
+#: ../mail/mail-component.c:879
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: ../mail/mail-component.c:884
+#: ../mail/mail-component.c:885
 msgid "New Mail Folder"
 msgstr "Nova fascikla za poštu"
 
-#: ../mail/mail-component.c:885
+#: ../mail/mail-component.c:886
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../mail/mail-component.c:886
+#: ../mail/mail-component.c:887
 msgid "Create a new mail folder"
 msgstr "Napravi novu fasciklu za poštu"
 
-#: ../mail/mail-component.c:1033
+#: ../mail/mail-component.c:1034
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Neuspela nadogradnja podešavanja pošte ili fascikli."
 
@@ -13235,9 +13253,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL nije podržan u ovoj verziji Evolucije</b>"
 
 #: ../mail/mail-config.glade.h:4
-#, fuzzy
 msgid "<b>Sender  Photograph</b>"
-msgstr "<b>Opcije kalendara</b>"
+msgstr "<b>Fotografija pošiljaoca</b>"
 
 #: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
@@ -13245,7 +13262,7 @@ msgstr "<b>Po_tpisi</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr ""
+msgstr "<b>Opcija za prikaz prve poruke</b> (ne preporučuje se)"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
@@ -13397,50 +13414,46 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
 #: ../mail/mail-config.glade.h:48
-msgid "Beep w_hen new mail arrives"
-msgstr "S_virni kada stigne nova pošta"
-
-#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "K_odna strana:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
 msgid "Ch_eck for Supported Types "
 msgstr "_Proveri podržane tipove "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
 msgid "Check in_coming mail for junk"
 msgstr "Proveri ima li đubreta u _pristigloj pošti"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:51
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Proveri da pristigle poruke nisu đubre"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
 msgid "Cle_ar"
 msgstr "Oči_sti"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
 msgid "Clea_r"
 msgstr "Očis_ti"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
 msgid "Colors"
 msgstr "Boje"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13456,141 +13469,141 @@ msgstr ""
 "\n"
 "Kliknite „Primeni“ da sačuvate podešavanja."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:64
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:67
 msgid "Delete junk mails on e_xit"
-msgstr ""
+msgstr "Briše poštu označenu kao đubre pri i_zlazu"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Digitalno potpiši odlazeće poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:70
 msgid "Do not format text contents in mails if the text si_ze exceeds"
 msgstr "Ne iscrtavaj sadržaj teksta poruka ako veličina prela_zi"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "_Fascikla Priprema:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Nalozi e-pošte"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Elektronska _adresa:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni fascikle sa _smećem na izlazu"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za ši_frovanje:"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Šifruj odlazeće poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:82
-msgid "Fi_xed width Font:"
-msgstr "Slovni lik srazmerne širine:"
-
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
 msgstr "Utvrđene-pirine:"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:82
+msgid "Fix_ed width Font:"
+msgstr "Font nep_romenjive širine:"
+
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Osobine slovnog lika"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Oblikuj poruke u H_TML"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Ime i prezime:"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML pošta"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:93
 msgid "Inline original message (Outlook style)"
-msgstr ""
+msgstr "Originalna poruka u telu poruke ((Outlook stil)"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:95
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:96
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:101
 msgid "Mailbox location"
 msgstr "Mesto poštanskog sandučeta"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:102
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:103
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: nećete biti upitani za lozinku dok se ne povežete prvi put"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:104
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:105
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG IB _ključa:"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:108
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13598,7 +13611,7 @@ msgstr ""
 "Unesite dole opisno ime za ovaj nalog.\n"
 "Ovo ime će biti korišćeno samo za potrebe prikaza."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13606,7 +13619,7 @@ msgstr ""
 "Unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
 "pitajte administratora sistema ili prodavca Internet usluga."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:112
 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 "
@@ -13615,54 +13628,58 @@ msgstr ""
 "Unesite dole ime i elektronsku adresu. „Neobavezna“ polja dole ne moraju biti "
 "popunjena, osim ako ne želite da ove podatke uključite u poruke koje šaljete."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:113
 msgid "Please select among the following options"
 msgstr "Molim izaberite među sledećim mogućnostima"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:114
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada šalješ poruke samo sa navedenim Bcc primaocima"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:115
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:116
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:117
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:118
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:120
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:121
 msgid "S_earch for sender photograph only in local addressbooks"
-msgstr ""
+msgstr "Tr_aži fotografiju pošiljaoca samo u lokalnim adresarima"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:122
 msgid "S_elect..."
 msgstr "Izab_eri..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:123
 msgid "S_end message receipts:"
 msgstr "_Pošalji priznanice:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:124
 msgid "S_tandard Font:"
 msgstr "_Standardni slovni lik:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:125
 msgid "Se_lect..."
 msgstr "Iza_beri..."
 
+#: ../mail/mail-config.glade.h:127
+msgid "Select Drafts Folder"
+msgstr "Odabira fasciklu Priprema"
+
 #: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML slovni lik fiksirane veličine"
@@ -13680,61 +13697,65 @@ msgid "Select HTML variable width font for printing"
 msgstr "Izaberite HTML slovni lik promenljive veličine za štampu"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Sent Folder"
+msgstr "Odabira fasciklu Poslato"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži autentifikaciju"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Server _Type: "
 msgstr "_Tip servera: "
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signatures Table"
 msgstr "Tabela potpisa"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "T_ype: "
 msgstr "T_ip: "
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Lista jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13744,7 +13765,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu. "
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13752,15 +13773,15 @@ msgstr ""
 "Ukucajte ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: „Poslovni“ ili „Lični“"
 
-#: ../mail/mail-config.glade.h:152 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "V_ariable-width:"
 msgstr "Pro_menljiva veličina:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13770,100 +13791,104 @@ msgstr ""
 "\n"
 "Kliknite „Napred“ za početak. "
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:159
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
+msgid "_Beep when new mail arrives"
+msgstr "S_virni kada stigne nova pošta"
+
+#: ../mail/mail-config.glade.h:162
 msgid "_Default junk plugin:"
-msgstr ""
+msgstr "_Podrazumevani dodatak za đubre:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Outlook kompatibilnost)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Keep Signature above the original message on replying"
-msgstr ""
+msgstr "_Zadrži potpis iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Load images in mail from contacts"
 msgstr "_Učitaj slike od kontakata u poruku"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj podrazumevani nalog"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skripta:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Show image animations"
 msgstr "Prikaži _animacije"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Show the photograph of sender in the email preview"
-msgstr ""
+msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Sažmite PRIMA/KOPIJA/NEVIDLJIVA KOPIJA zaglavlja u "
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Use Secure Connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste slovne likove kao drugi programi"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "addresses"
 msgstr "Adrese"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:187
 msgid "description"
 msgstr "opis"
 
@@ -13964,7 +13989,7 @@ msgstr "_Oznaka:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_načite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-folder-cache.c:875
+#: ../mail/mail-folder-cache.c:877
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
@@ -14012,7 +14037,7 @@ msgstr "Neuspelo slanje %d od %d poruka"
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:698
 msgid "Complete."
 msgstr "Završeno."
 
@@ -14140,9 +14165,9 @@ msgid "Reconnecting to %s"
 msgstr "Ponovno povezivanje na %s"
 
 #: ../mail/mail-ops.c:2361
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Exchange nalog nije na mreži."
+msgstr "Priprema nalog ’%s‘ za rad van mreže"
 
 #: ../mail/mail-ops.c:2444
 msgid "Checking Service"
@@ -14247,11 +14272,11 @@ msgstr "Osvežavanje fascikla pretrage za ’%s: %s‘"
 msgid "Updating Search Folders for '%s'"
 msgstr "Osvežavanje fascikla pretrage za ’%s‘"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1043
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1127
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
@@ -14473,9 +14498,8 @@ msgid "Discard changes?"
 msgstr "Zanemariti promenjeno?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Do not d_elete"
-msgstr "Ne briši"
+msgstr "Ne _briši"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Do not delete"
@@ -14486,14 +14510,16 @@ msgid "Do not disable"
 msgstr "Nemoj isključiti"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "Da li želite da ovu radnju primenite na sve podfascikle?"
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "Da li želite da ovu radnju takođe primenite na sve podfascikle?"
 
 #: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
+"Želite li lokalno da uskladite fascikle koje su označene za korišćenje van "
+"mreže?"
 
 #: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
@@ -14592,21 +14618,22 @@ msgid "Mark all messages as read"
 msgstr "Označi sve poruke kao pročitane"
 
 #: ../mail/mail.error.xml.h:72
-msgid "Mark all messages in subfolders as read?"
-msgstr "Označi sve poruke kao pročitane u podfascikli"
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "Označiti sve poruke u ovoj fascikli i podfasciklama kao pročitane?"
 
 #: ../mail/mail.error.xml.h:73
-msgid "Mark as _Read"
-msgstr "O_znači kao pročitano"
-
-#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Nedostaje fascikla."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Izvori nisu izabrani."
 
+# bug: requires a comment on usage
+#: ../mail/mail.error.xml.h:76
+msgid "Only on _Current Folder"
+msgstr "Samo na _tekućoj fascikli"
+
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Otvaranje previše poruka odjednom može suviše da potraje."
@@ -14680,14 +14707,12 @@ msgid "Signature Already Exists"
 msgstr "Potpis već postoji"
 
 #: ../mail/mail.error.xml.h:94
-#, fuzzy
 msgid "Synchronize"
-msgstr "Uskladi sa iPod džepnim uređajem"
+msgstr "Uskladi"
 
 #: ../mail/mail.error.xml.h:95
-#, fuzzy
 msgid "Synchronize folders locally for offline usage?"
-msgstr "Ovaj kalendar nije označen za korišćenje van mreže."
+msgstr "Uskladiti fascikle lokalno za rad van mreže."
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
@@ -14851,22 +14876,21 @@ msgid "_Discard changes"
 msgstr "_Zanemari promene"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Do not Mark as Read"
-msgstr "Os_tavi nepročitano"
-
-#: ../mail/mail.error.xml.h:135
-#, fuzzy
 msgid "_Do not Synchronize"
-msgstr "Ne spaša_vaj"
+msgstr "_Ne usklađuj"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Expunge"
 msgstr "Iz_baci"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
+#: ../mail/mail.error.xml.h:140
+msgid "on Current Folder and _Subfolders"
+msgstr "na trenutne fascikle i _podfascikle"
+
 #: ../mail/message-list.c:1022
 msgid "Unseen"
 msgstr "Neviđeno"
@@ -14903,30 +14927,30 @@ msgstr "Više"
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:203
-#: ../widgets/table/e-cell-date.c:72
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Danas %l:%M %p"
 
-#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %l:%M %p"
 
-#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
@@ -14934,7 +14958,7 @@ msgstr "%d. %b %Y."
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../mail/message-list.c:3752
+#: ../mail/message-list.c:3755
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
@@ -15035,6 +15059,59 @@ msgstr "Lokalni imenici"
 msgid "Provides core functionality for local address books."
 msgstr "Obezbeđuje osnovnu funkcionalnost za lokalne imenike."
 
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "Enable attachment reminder plugin"
+msgstr "Uključuje dodatak za podsetnik za priloge"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Spisak predmeta za kojima će dodatak za podsećanje uključivanja priloga tragati "
+"u telu poruke"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:452
+msgid "Keywords"
+msgstr "Ključne reči"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:501
+msgid "Attachment Reminder Preferences"
+msgstr "Svojstva podsetnika za priloge"
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+msgid "Remind _missing attachments"
+msgstr "Podseti za _nedostajuće priloge"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Podsetnik na priloge"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+"Traga za predmetima u kojima se može nalaziti prilog u poruci i upozorava "
+"ukoliko priloga nema"
+
+#: ../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."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "Poruka nema priloge"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Continue Editing"
+msgstr "_Nastavi uređivanje"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -15048,18 +15125,16 @@ msgid "Audio inline plugin"
 msgstr "Dodatak za zvuk unutar poruke"
 
 #: ../plugins/backup-restore/backup-restore.c:96
-#, fuzzy
-msgid "Select name of the Evolution archive"
-msgstr "Izaberite ime arhive Evolucije"
+msgid "Select name of the Evolution backup file"
+msgstr "Izaberite ime za rezervnu kopiju Evolucije"
 
 #: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
 #: ../plugins/backup-restore/backup-restore.c:139
-#, fuzzy
-msgid "Select name of the Evolution archive to restore"
-msgstr "Izaberite arhivu Evolucije za povraćaj"
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Izaberite ime rezervne kopije Evolucije za povraćaj"
 
 #: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
@@ -15067,29 +15142,29 @@ msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
 #: ../plugins/backup-restore/backup-restore.c:236
 msgid "Restore from backup"
-msgstr ""
+msgstr "Vraća iz rezervne kopije"
 
 #: ../plugins/backup-restore/backup-restore.c:238
 msgid ""
-"You can restore Evolution from your archive. It can restore all the Mails/"
-"Calendars/Tasks/Memos/Addressbook. \n"
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
+"Evoluciju možete povratiti iz rezervne kopije. Možete povratiti poštu, "
+"kalendare, zaduženja, beleške, kontakte.\n"
+"Takođe se  mogu povratiti sva lična podešavanja, filteri za poštu, itd."
 
 #: ../plugins/backup-restore/backup-restore.c:244
-#, fuzzy
-msgid "_Restore Evolution from the backup archive"
-msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
+msgid "_Restore Evolution from the backup file"
+msgstr "_Povrati Evoluciju iz datoteke rezervne kopije"
 
 #: ../plugins/backup-restore/backup-restore.c:251
-#, fuzzy
 msgid "Please select an Evolution Archive to restore:"
-msgstr "Izaberite arhivu Evolucije za povraćaj"
+msgstr "Izaberite arhivu Evolucije za povraćaj:"
 
 #: ../plugins/backup-restore/backup-restore.c:254
-#, fuzzy
 msgid "Choose a file to restore"
-msgstr "Izaberite datoteku"
+msgstr "Izaberite datoteku za povraćaj"
 
 #: ../plugins/backup-restore/backup.c:40
 msgid "Backup Evolution directory"
@@ -15100,8 +15175,8 @@ msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraćaj Evolucije"
 
 #: ../plugins/backup-restore/backup.c:44
-msgid "Check Evolution archive"
-msgstr "Proverava arhivu Evolucije"
+msgid "Check Evolution Backup"
+msgstr "Proverava rezervnu kopiju Evolucije"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:46
@@ -15109,75 +15184,68 @@ msgid "Restart Evolution"
 msgstr "Ponovo pokreće Evoluciju"
 
 #: ../plugins/backup-restore/backup.c:48
-#, fuzzy
-msgid "With GUI"
-msgstr "Širina"
+msgid "With Graphical User Interface"
+msgstr "Sa grafičkom okruženjem"
 
 #: ../plugins/backup-restore/backup.c:67
 #: ../plugins/backup-restore/backup.c:107
-#, fuzzy
 msgid "Shutting down Evolution"
-msgstr "Gašenje %s (%s)\n"
+msgstr "Gašenje Evolucije"
 
 #: ../plugins/backup-restore/backup.c:72
-#, fuzzy
 msgid "Backing Evolution accounts and settings"
-msgstr "Pravi rezervu i oporavlja podatke i podešavanja Evolucije"
+msgstr "Izrađuje rezervnu kopiju naloga i podešavanja Evolucije"
 
 #: ../plugins/backup-restore/backup.c:77
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
+"Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zaduženja, "
+"beleške)"
 
 #: ../plugins/backup-restore/backup.c:87
-#, fuzzy
 msgid "Backup complete"
-msgstr "_Obeleži kao nezavršeno"
+msgstr "Izrada rezervne kopije završena"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:92
 #: ../plugins/backup-restore/backup.c:133
-#, fuzzy
 msgid "Restarting Evolution"
-msgstr "Ponovo pokreće Evoluciju"
+msgstr "Ponovno pokretanje Evolucije"
 
 #: ../plugins/backup-restore/backup.c:111
-#, fuzzy
 msgid "Backup current Evolution data"
-msgstr "Direktorijum za rezervu Evolucije"
+msgstr "Izrađuje rezervnu kopiju trenutnih podataka Evolucije"
 
 #: ../plugins/backup-restore/backup.c:116
-msgid "Extracting files from the archive"
-msgstr ""
+msgid "Extracting files from backup"
+msgstr "Otpakivanje datoteka iz rezervne kopije"
 
 #: ../plugins/backup-restore/backup.c:122
-#, fuzzy
 msgid "Loading Evolution settings"
-msgstr "Izmeni podešavanja Evolucije"
+msgstr "Učitava podešavanja Evolucije"
 
 #: ../plugins/backup-restore/backup.c:126
 msgid "Removing temporary backup files"
-msgstr ""
+msgstr "Uklanjanje privremenih rezervnih datoteka"
 
 #: ../plugins/backup-restore/backup.c:244
-#, fuzzy, c-format
-msgid "Backing up to %s"
-msgstr "Pošta za %s"
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Smešta rezervnu kopiju u fasciklu %s"
 
 #: ../plugins/backup-restore/backup.c:249
-#, fuzzy, c-format
-msgid "Restoring from %s"
-msgstr "Uklanjanje fascikle %s"
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "Vrši povraćaj iz fascikle %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
 #: ../plugins/backup-restore/backup.c:264
-#, fuzzy
 msgid "Evolution Backup"
-msgstr "Evolucija pošta"
+msgstr "Rezervna kopija Evolucije"
 
 #: ../plugins/backup-restore/backup.c:264
-#, fuzzy
 msgid "Evolution Restore"
-msgstr "Proba Evolucije"
+msgstr "Povraćaj Evolucije"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -15189,14 +15257,14 @@ msgid "Backup and restore plugin"
 msgstr "Dodatak za izradu rezerve i oporavak"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to close Evolution?"
-msgstr "Sigurno želite da obrišete ovaj nalog?"
+msgstr "Sigurno želite da zatvorite Evoluciju?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
-msgid "Are you sure you want to restore Evolution from the selected archive?"
-msgstr "Sigurno želite da obrišete ovaj sastanak?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Sigurno želite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15205,16 +15273,18 @@ msgid ""
 "you want Evolution to restart automatically after backup, please enable the "
 "toggle button."
 msgstr ""
+"Izrada rezervne kopije može biti pokrenuta samo kada Evolucija ne radi. Pre "
+"nego što nastavite, proverite da li ste sačuvali i zatvorili sve prozore u "
+"kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon "
+"završetka procedure, označite ovu opciju."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
-msgid "Invalid Evolution archive"
-msgstr "Proverava arhivu Evolucije"
+msgid "Invalid Evolution backup file"
+msgstr "Neispravna datoteka rezervne kopije Evolucije"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#, fuzzy
-msgid "Please select a valid archive file to restore."
-msgstr "Izaberite arhivu Evolucije za povraćaj"
+msgid "Please select a valid backup file to restore."
+msgstr "Izaberite ispravnu datoteku za povraćaj"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -15224,52 +15294,57 @@ msgid ""
 "you proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 msgstr ""
+"Ovo će obrisati sve trenutne podatke i podešavanja Evolucije i povratiti ih "
+"iz rezervne kopije. Ova procedura se može pokrenuti samo kada Evolucija ne "
+"radi. Pre nego što nastavite, proverite da li ste zatvorili sve prozore u "
+"kojima ste radili. Ukoliko želite da se Evolucija sama pokrene nakon "
+"završetka procedure, označite ovu opciju."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "Pravi rezervu i oporavlja podatke i podešavanja Evolucije"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
 msgid "R_estore Settings..."
-msgstr "Oporavlja podešavanja..."
+msgstr "Op_oravlja podešavanja..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-#, fuzzy
 msgid "_Backup Settings..."
-msgstr "Podešavanja za rezervu..."
+msgstr "_Izrađuje rezervu podešavanja..."
 
-#: ../plugins/bbdb/bbdb.c:459 ../plugins/bbdb/bbdb.c:468
+#: ../plugins/bbdb/bbdb.c:451 ../plugins/bbdb/bbdb.c:460
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:483
+#: ../plugins/bbdb/bbdb.c:475
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Automatski napravi unose u imenik pri odgovaranju na poštu"
 
-#: ../plugins/bbdb/bbdb.c:489
+#: ../plugins/bbdb/bbdb.c:481
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi imenik za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:504
+#: ../plugins/bbdb/bbdb.c:496
 msgid "Instant Messaging Contacts"
 msgstr "Brze poruke"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:519
+#: ../plugins/bbdb/bbdb.c:511
 msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Povremeno uskladi podatke o kontaktima i slike sa mog brzog glasnika"
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr ""
+"Povremeno usklađuje podatke o kontaktima i slikama sa Pidgin listom prijatelja"
 
-#: ../plugins/bbdb/bbdb.c:525
-msgid "Select Address book for Gaim buddy list"
-msgstr "Izaberi imenik za brog glasnia"
+#: ../plugins/bbdb/bbdb.c:517
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Bira adresar za Pidgin listu prijatelja"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:536
+#: ../plugins/bbdb/bbdb.c:528
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -15287,26 +15362,36 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
 msgid "Convert mail text to _Unicode"
-msgstr ""
+msgstr "Prebaci tekst pošte u _Unikod"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
 msgid "Convert mail text to Unicode"
-msgstr ""
+msgstr "Prebacuje tekst pošte u Unikod"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
 msgstr ""
+"Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta "
+"čiji su uzrok različiti kodni rasporedi."
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr "Opcije Bogofiltera"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr "Filtrira neželjenu poštu korišćenjem Bogofiltera."
 
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
+#: ../plugins/calendar-http/calendar-http.c:135
 msgid "_URL:"
 msgstr "_Adresa :"
 
@@ -15330,15 +15415,19 @@ msgstr "Lokalni kalendari"
 msgid "Provides core functionality for local calendars."
 msgstr "Daje osnovnu upotrebu lokalnim kalendarima."
 
-#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-http/calendar-http.c:273
 #: ../plugins/calendar-weather/calendar-weather.c:546
 msgid "_Refresh:"
 msgstr "O_sveži:"
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:341
 msgid "_Secure connection"
 msgstr "_Koristi sigurnu vezu"
 
+#: ../plugins/calendar-http/calendar-http.c:406
+msgid "Userna_me:"
+msgstr "Korisničko_ime:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP Kalendari"
@@ -15436,8 +15525,8 @@ msgstr "Podrazumevani klijentza poštu "
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Želite li da Evoluciju učinite podrazumevanim klijentom e-pošte?"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as _default folder"
 msgstr "Označava kao podrazumevanu _fasciklu"
 
@@ -15533,7 +15622,6 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "Upravljajte podešavanjima delegata za nalog Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-#, fuzzy
 msgid "Delegation Assistant"
 msgstr "Pomoćnik za delegiranje"
 
@@ -15556,29 +15644,29 @@ msgstr "Veličina fascikli"
 msgid "Exchange Settings"
 msgstr "Exchange podešavanja"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:617
+#: ../plugins/exchange-operations/exchange-account-setup.c:618
 msgid "_OWA URL:"
 msgstr "_OWA adresa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:643
+#: ../plugins/exchange-operations/exchange-account-setup.c:644
 msgid "A_uthenticate"
 msgstr "A_utentifikuj"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:836
+#: ../plugins/exchange-operations/exchange-account-setup.c:837
 msgid "Authentication Type"
 msgstr "Tip autentifikacije"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:850
+#: ../plugins/exchange-operations/exchange-account-setup.c:851
 msgid "Ch_eck for Supported Types"
 msgstr "_Proveri podržane tipove"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:957
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:958
+#: ../plugins/exchange-operations/exchange-account-setup.c:959
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 msgid "0 KB"
 msgstr "0 KB"
@@ -15630,65 +15718,75 @@ msgid "Your password will expire in the next %d days"
 msgstr "Broj dana nakon kojih Vaša lozinka ističe: %d"
 
 #. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:159
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "Custom"
 msgstr "Prilagođeno"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:183
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Uređivač (čita, pravi, uređuje)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:187
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (čita, pravi)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Recenzent (samo čita)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:241
+#: ../plugins/exchange-operations/exchange-delegates-user.c:247
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegiraj ovlašćenja"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 msgstr "Ovlašćenja za %s"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:339
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid ""
-"This message was sent automatically by Evolution \t\t\t\t\tto inform you "
-"that you have been designated as a \t\t\t\t\tdelegate. You can now send "
-"messages on my behalf.\t\t\t\t\t \n"
-"\n"
-"You have been given the following permissions \t\t\t\t\ton my folders:\n"
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
+"Ovu poruku je Evolucija automatski poslala da bi Vas obavestila da ste "
+"određeni za delegata. Sada možete slati poruke u moje ime."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:356
-msgid ""
-"\n"
-"You are also permitted \t\t\t\t\t\t\tto see my private items."
-msgstr ""
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+msgid "You have been given the following permissions on my folders:"
+msgstr "Dodeljena su Vam sledeća ovlašćenja na mojim fasciklama:"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:360
-msgid ""
-"\n"
-"However you are not permitted\t\t\t\t\t\t\t to see my private items."
-msgstr ""
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+msgid "You are also permitted to see my private items."
+msgstr "Takođe Vam je dozvoljeno da vidite moje privatne stvari."
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+msgid "However you are not permitted to see my private items."
+msgstr "Niste ovlašćeni, međutim, da vidite moje privatne podatke."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:392
+#: ../plugins/exchange-operations/exchange-delegates-user.c:410
 #, c-format
-msgid "You have been designated \t\t\t\t\t\tas a delegate for %s"
-msgstr ""
+msgid "You have been designated as a delegate for %s"
+msgstr "%s Vas je odredio za svog delegata"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
@@ -15768,9 +15866,8 @@ msgid "_Inbox:"
 msgstr "_Sanduče:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-#, fuzzy
 msgid "_Summarize permissions"
-msgstr "Delegiraj ovlašćenja"
+msgstr "Sačini _pregled ovlašćenja"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
@@ -15996,22 +16093,23 @@ msgid "Request a _read receipt for this message"
 msgstr "Zahtevaj _priznanicu  da je pročitana za ovu poruku"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-#, fuzzy
 msgid "Send as Delegate"
-msgstr "Unesi delegata"
+msgstr "Pošalji kao delegat"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "_Osetljivost: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-#, fuzzy
 msgid "_User"
-msgstr "_Korisnik:"
+msgstr "_Korisnik"
 
+# Nejasno. "Čemu ovo služi, a uz to i ne radi?".
+# http://bugzilla.gnome.org/show_bug.cgi?id=458512
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+#, fuzzy
 msgid "button-user"
-msgstr ""
+msgstr "dugme-korisnik"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
@@ -16223,7 +16321,7 @@ msgstr "Lozinka je uspešno promenjena."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr ""
+msgstr "Unesite IB delegata ili isključite opciju slanja kao delegata"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please make sure the Global Catalog Server name is correct."
@@ -16313,7 +16411,7 @@ msgstr ""
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
-msgstr ""
+msgstr "Dozvonjeno Vam je slanje poruke u ime samo jednog delegata odjednom."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
@@ -16375,6 +16473,36 @@ msgstr "Prijavi se na zaduženja drugog korisnika"
 msgid "Check folder permissions"
 msgstr "Proveri ovlašćenja fascikli"
 
+#: ../plugins/face/face.c:58
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "Izaberite (48*48) png veličine < 700bajta"
+
+#: ../plugins/face/face.c:68
+msgid "PNG files"
+msgstr "PNG datoteke"
+
+#: ../plugins/face/face.c:73
+msgid "Select a (48*48) png of size < 720bytes"
+msgstr "Izaberite (48*48) png veličine < 720bajta"
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+msgid "_Face"
+msgstr "_Lice"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing mails. First time the user needs to configure "
+"a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces "
+"This will be used in mails that are sent further."
+msgstr ""
+"Priloži zaglavlje s licem odlaznoj pošti. Potrebno je da korisnik podesi "
+"48*48 png sliku prvi put. Ona je šifrirana kao base64  i smeštena u ~/."
+"evolution/faces Kao takva će biti korišćena u pošti koja se nadalje šalje."
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Lice"
+
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -16393,7 +16521,7 @@ msgstr "Odjavi fascikle"
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:428
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
 msgid "Checklist"
 msgstr "Spisak"
 
@@ -16438,15 +16566,16 @@ msgstr "Instaliraj deljenu fasciklu"
 msgid "Shared Folder Installation"
 msgstr "Instalacija deljene fascikle"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
 msgstr "Podešavanja za đubre"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Podešavanja pošte za đubre</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Podešavanja pošte za đubre"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
 msgstr "Podešavanja pošte za đubre..."
 
@@ -16458,10 +16587,6 @@ msgstr "<b>Neželjene poruke:</b>"
 msgid "Email:"
 msgstr "E-pošta:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "Podešavanja pošte za đubre"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -16510,7 +16635,7 @@ msgid "<b>Users:</b>"
 msgstr "<b>Korisnici:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-click-to-add.c:507
 msgid "Message"
 msgstr "Poruka"
 
@@ -16610,16 +16735,16 @@ msgstr "%sUnesite lozinku za %s (korisnik %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:516
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "Prijava za mrežnog _posrednika..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:701
 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."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:706
 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."
@@ -16649,64 +16774,56 @@ msgstr "Dodaj "
 msgid "Modify"
 msgstr "Izmeni"
 
-#: ../plugins/groupwise-features/status-track.c:103
+#: ../plugins/groupwise-features/status-track.c:105
 msgid "Message Status"
 msgstr "Status poruke"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:117
-msgid "<b>Subject</b> :"
-msgstr "<b>Naslov</b>"
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "Naslov:"
 
-#: ../plugins/groupwise-features/status-track.c:129
-msgid "<b>From</b> :"
-msgstr "<b>Šalje</b>"
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "Šalje:"
 
-#: ../plugins/groupwise-features/status-track.c:142
-msgid "<b>Creation date</b> :"
-msgstr "<b>Datum pravljenja</b>"
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr "Datum pravljenja:"
 
-#: ../plugins/groupwise-features/status-track.c:178
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Recipient: "
-msgstr "Primaoci"
+msgstr "Primalac:"
 
-#: ../plugins/groupwise-features/status-track.c:185
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:193
 msgid "Delivered: "
-msgstr "_Isporučeno"
+msgstr "Isporučeno:"
 
-#: ../plugins/groupwise-features/status-track.c:191
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Opened: "
-msgstr "Otvori"
+msgstr "Otvoreno:"
 
-#: ../plugins/groupwise-features/status-track.c:196
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Accepted: "
-msgstr "Prihvaćeno"
+msgstr "Prihvaćeno:"
 
-#: ../plugins/groupwise-features/status-track.c:201
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Deleted: "
-msgstr "Obrisano"
+msgstr "Obrisano:"
 
-#: ../plugins/groupwise-features/status-track.c:206
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Declined: "
-msgstr "Odbijeno"
+msgstr "Odbijeno:"
 
-#: ../plugins/groupwise-features/status-track.c:211
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Completed: "
-msgstr "Završeno "
+msgstr "Završeno:"
 
-#: ../plugins/groupwise-features/status-track.c:216
-#, fuzzy
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Un-delivered: "
-msgstr "_Isporučeno"
+msgstr "Neisporučeno:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "Prati status poruke..."
 
@@ -16722,11 +16839,11 @@ msgstr "Podešavanje Hula naloga"
 msgid "Custom Header"
 msgstr "Prilagođeno zaglavlje"
 
-#: ../plugins/imap-features/imap-headers.c:256
+#: ../plugins/imap-features/imap-headers.c:259
 msgid "Custom Headers"
 msgstr "Prilagođena zaglavlja"
 
-#: ../plugins/imap-features/imap-headers.c:266
+#: ../plugins/imap-features/imap-headers.c:269
 msgid "IMAP Headers"
 msgstr "IMAP zaglavlja"
 
@@ -16735,7 +16852,6 @@ msgid "<b>Custom Headers</b>"
 msgstr "<b>Prilagođena zaglavlja</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-#, fuzzy
 msgid "<b>IMAP Headers</b>"
 msgstr "<b>IMAP zaglavlja</b>"
 
@@ -16802,7 +16918,7 @@ msgid "Select Calendar"
 msgstr "Izaberite kalendar"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:700
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "U_voz"
 
@@ -16815,17 +16931,28 @@ msgstr "Uvezi u kalendar"
 msgid "Imports ICS attachments to calendar."
 msgstr "Uvozi ICS priloge u kalendar."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:64
-#, fuzzy
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:33
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "Sloj hardverske apstrakcije nije učitan"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+"Servis \"hald\"  je neophodan ali nije trenutno aktivan. Uključite servis i "
+"ponovo pokrenite program, ili kontaktirajte administratora sistema."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:66
+msgid "Search for an iPod failed"
+msgstr "Traženje iPod uređaja nije uspelo"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:67
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
-"\n"
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Traganje za iPod neuspešno</span>\n"
-"\n"
-"Evolucija nije pronašla iPod radi sinhronizacije. Ili nije priključen na "
+"Evolucija nije pronašla iPod radi usklađivanja. Uređaj ili nije priključen na "
 "sistem ili nije uključen."
 
 #: ../plugins/ipod-sync/ical-format.c:137
@@ -16846,117 +16973,143 @@ msgstr "Uskladi sa iPod džepnim uređajem"
 msgid "iPod Synchronization"
 msgstr "_Usklađivanje sa iPod džepnim uređajem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:427
-#: ../plugins/itip-formatter/itip-formatter.c:548
+#: ../plugins/itip-formatter/itip-formatter.c:428
+#: ../plugins/itip-formatter/itip-formatter.c:549
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Nije moguće otvaranje kalendara „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:569
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Jedan zakazani sastanak u kalendaru „%s“ je u isto vreme kad i ovaj susret"
 
-#: ../plugins/itip-formatter/itip-formatter.c:594
+#: ../plugins/itip-formatter/itip-formatter.c:595
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Zakazani sastanak je pronađen u kalendaru „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:670
+#: ../plugins/itip-formatter/itip-formatter.c:671
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:677
+#: ../plugins/itip-formatter/itip-formatter.c:678
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ne mogu pronaći ovaj susret u nijednom kalendaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:681
+#: ../plugins/itip-formatter/itip-formatter.c:682
 msgid "Unable to find this task in any task list"
 msgstr "Ne mogu pronaći ovo zaduženje u nijednom spisku zaduženja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
-msgid "Unable to find this journal entry in any journal"
-msgstr "Ne mogu da pronađem ovaj unos u nijednom dnevniku"
+#: ../plugins/itip-formatter/itip-formatter.c:686
+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:758
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Searching for an existing version of this appointment"
 msgstr "Pretraga jedne postojeće verzije ovog sastanka je u toku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:921
+#: ../plugins/itip-formatter/itip-formatter.c:922
 msgid "Unable to parse item"
 msgstr "Nije moguća obrada predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:980
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nije moguće slanje predmeta kalendaru ’%s‘.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:992
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru ’%s‘ kao prihvaćeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:995
+#: ../plugins/itip-formatter/itip-formatter.c:996
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru ’%s‘ uz rezervu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1000
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru ’%s‘ kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1006
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1099
+#: ../plugins/itip-formatter/itip-formatter.c:1100
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1106
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../plugins/itip-formatter/itip-formatter.c:1109
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nije moguće poslati obaveštenje o otkazivanju delegatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1193
+#: ../plugins/itip-formatter/itip-formatter.c:1194
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Stanje učesnika nije osveženo zbog neispravnog stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1220
+#: ../plugins/itip-formatter/itip-formatter.c:1221
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nije moguće osvežavanje za učesnika. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1225
 msgid "Attendee status updated"
 msgstr "Stanje učesnika je osveženo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1250
+msgid "Meeting information sent"
+msgstr "Podatak o sastanku poslat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+msgid "Task information sent"
+msgstr "Podatak o zaduženju poslat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1256
+msgid "Memo information sent"
+msgstr "Podatak o belešci poslat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1265
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "Nije moguće slanje podataka o sastanku, sastanak ne postoji"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1268
+msgid "Unable to send task information, the task does not exist"
+msgstr "Nije moguće slanje podatka o zaduženju, zaduženje ne postoji"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1271
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "Nije moguće slanje podataka o belešci, beleška ne postoji"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1346
+#: ../plugins/itip-formatter/itip-formatter.c:1361
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1352
+#: ../plugins/itip-formatter/itip-formatter.c:1347
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Poruka prijavljuje kalendar, ali taj kalendar nije ispravan iKalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1387
-#: ../plugins/itip-formatter/itip-formatter.c:1405
-#: ../plugins/itip-formatter/itip-formatter.c:1486
+#: ../plugins/itip-formatter/itip-formatter.c:1397
+#: ../plugins/itip-formatter/itip-formatter.c:1415
+#: ../plugins/itip-formatter/itip-formatter.c:1496
 msgid "The item in the calendar is not valid"
 msgstr "Predmet u kalendaru nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1388
-#: ../plugins/itip-formatter/itip-formatter.c:1406
-#: ../plugins/itip-formatter/itip-formatter.c:1487
+#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1497
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16964,11 +17117,11 @@ msgstr ""
 "Poruka sadrži kalendar, ali on ne sadrži događaje, zaduženja ili slobodno/"
 "zauzeto podatke."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1427
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16976,19 +17129,31 @@ msgstr ""
 "Radi obrade svih ovih predmeta, potrebno je datoteku sačuvati a kalendar "
 "uvesti"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+msgid "This meeting recurs"
+msgstr "Ovaj se sastanak ponavlja"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2050
+msgid "This task recurs"
+msgstr "Ovo se zaduženjese ponavlja"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2053
+msgid "This memo recurs"
+msgstr "Ova se beleška ponavlja"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2244
+#: ../plugins/itip-formatter/itip-formatter.c:2254
 msgid "_Delete message after acting"
 msgstr "_Obriši poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2254
-#: ../plugins/itip-formatter/itip-formatter.c:2286
+#: ../plugins/itip-formatter/itip-formatter.c:2264
+#: ../plugins/itip-formatter/itip-formatter.c:2296
 msgid "Conflict Search"
 msgstr "Tabela pretrage za preklapanjima"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2269
+#: ../plugins/itip-formatter/itip-formatter.c:2279
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
@@ -17150,14 +17315,14 @@ msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 #: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Odgovorite u ime <b>%s</b>"
 
 #: ../plugins/itip-formatter/itip-view.c:351
 #: ../plugins/itip-formatter/itip-view.c:439
 #: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Primljeno u ime <b>%s</b>"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
@@ -17195,11 +17360,12 @@ msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> želi da doda postojećem sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:380
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr "<b>%s</b> želi da primi najnoviji podatak za sledeći sastanak:"
+msgstr ""
+"<b>%s</b> preko %s želi da primi najnovije informacije za sledeći sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
@@ -17208,9 +17374,9 @@ msgid ""
 msgstr "<b>%s</b> želi da primi najnoviji podatak za sledeći sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> posla sledeći odgovor za sastanak:"
+msgstr "<b>%s</b> preko %s šalje sledeći odgovor za sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
@@ -17228,9 +17394,9 @@ msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> otkaza sledeći sastanak."
 
 #: ../plugins/itip-formatter/itip-view.c:398
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> predloži sledeće promene sastanka."
+msgstr "<b>%s</b> preko %s predlaže sledeće promene sastanka."
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
@@ -17283,12 +17449,13 @@ msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b želi da doda postojećem zaduženju:"
 
 #: ../plugins/itip-formatter/itip-view.c:468
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr ""
-"<b>%s</b> želi da dobije najnovije informacije za sledeće dodeljeno zaduženje:"
+"<b>%s</b> preko %s želi da dobije najnovije informacije za sledeće dodeljeno "
+"zaduženje:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
@@ -17299,10 +17466,10 @@ msgstr ""
 "<b>%s</b> želi da dobije najnovije informacije za sledeće dodeljeno zaduženje:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> posla nazad sledeći odgovor na dodeljeno zaduženje:"
+msgstr "<b>%s</b> preko %s vraća sledeći odgovor na dodeljeno zaduženje:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
@@ -17320,10 +17487,10 @@ msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> otkaza sledeće dodeljeno zaduženje:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> predloži sledeće promene u dodeli zaduženja:"
+msgstr "<b>%s</b> preko %s predlaže sledeće promene u dodeli zaduženja:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
@@ -17441,19 +17608,16 @@ msgid "Comment:"
 msgstr "Napomena:"
 
 #: ../plugins/itip-formatter/itip-view.c:1067
-#, fuzzy
 msgid "Send _reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
 #: ../plugins/itip-formatter/itip-view.c:1095
-#, fuzzy
 msgid "Send _updates to attendees"
 msgstr "Pošalji o_svežene podatke učesnicima"
 
 #: ../plugins/itip-formatter/itip-view.c:1104
-#, fuzzy
 msgid "_Apply to all instances"
-msgstr "Pri_meni na sve strukture"
+msgstr "Pri_meni na sve nivoe"
 
 #: ../plugins/itip-formatter/itip-view.c:1835
 msgid "_Tasks :"
@@ -17502,43 +17666,44 @@ msgstr "Isključi nalog"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Enable libnotify notifications of new mail"
-msgstr ""
+msgstr "Uključuje libnotify obaveštenja za novu poštu"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Every time a new mail arrives, pop up a libnotify notification."
 msgstr ""
+"Svaki put kada stigne nova pošta, prikaži prozorče sa libnotify obaveštenjem."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Make the status icon blink"
-msgstr ""
+msgstr "Čini da ikona statusa trepće"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "When the new-mail status icon is visible, make it blink."
-msgstr ""
+msgstr "Kada je ikona za novu poštu vidljiva, neka trepće."
 
 #: ../plugins/mail-notification/mail-notification.c:132
 #, c-format
 msgid "You have received %d new message in %s."
 msgid_plural "You have received %d new messages in %s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Primili ste %d novu poruku za %s."
+msgstr[1] "Primili ste %d nove poruke za %s."
+msgstr[2] "Primili ste %d novih poruka za %s."
 
 #: ../plugins/mail-notification/mail-notification.c:153
-#, fuzzy
 msgid "New email"
-msgstr "Nova beleška"
+msgstr "Nova poruka"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-#, fuzzy
 msgid "Mail Notification"
-msgstr "Obaveštenje o novoj pošti"
+msgstr "Obaveštenje o pošti"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid ""
-"Notifies the user with tray icon and a notify message whenever a new message "
-"is arrived."
+"Notifies the user with an icon in notification area and a notification "
+"message whenever a new message has arrived."
 msgstr ""
+"Obaveštava korisnika ikonom u obaveštajnoj zoni i porukom kada stigne nova "
+"poruka."
 
 #: ../plugins/mail-remote/client.c:30
 #, c-format
@@ -17816,7 +17981,7 @@ msgstr "Dodatak za uključivanje i isključivanje drugih dodataka."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:223
 msgid "Plugin Manager"
 msgstr "Upravljač dodacima"
 
@@ -17828,22 +17993,26 @@ msgstr "Uključuje i isključuje dodatke"
 msgid "_Plugins"
 msgstr "Do_daci"
 
-#: ../plugins/plugin-manager/plugin-manager.c:53
+#: ../plugins/plugin-manager/plugin-manager.c:55
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../plugins/plugin-manager/plugin-manager.c:56
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Opis"
 
-#: ../plugins/plugin-manager/plugin-manager.c:215
+#: ../plugins/plugin-manager/plugin-manager.c:226
+msgid "Configure"
+msgstr "Podešava"
+
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Napomena: neke izmene neće biti uključene pre ponovnog pokretanja"
 
-#: ../plugins/plugin-manager/plugin-manager.c:268
-#: ../plugins/plugin-manager/plugin-manager.c:327
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:350
 msgid "Plugin"
 msgstr "Dodatak"
 
@@ -17881,8 +18050,8 @@ msgid "Only ever show PLAIN"
 msgstr "Isključivo prikazuj PLAIN"
 
 #: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "HTML model"
+msgid "HTML _Mode"
+msgstr "HTML _režim"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
@@ -17927,7 +18096,13 @@ msgstr "Mesta"
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Unesite lozinku za ’%s‘"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
 msgid "Are you sure you want to remove this URL?"
 msgstr "Sigurno želite da uklonite ovu adresu?"
 
@@ -18012,32 +18187,32 @@ msgstr ""
 "Slobodno/zauzeto"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
-#, fuzzy
 msgid "SpamAssassin (built-in)"
 msgstr "Spam ubica (ugrađen)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-#, fuzzy
 msgid "This will make Spamassasin more reliable, but slower"
-msgstr "<small>Ovo će učiniti filter pouzdanijim, ali sporijim</small>"
+msgstr "Ovo će učiniti Ubicu spama pouzdanijim, ali sporijim"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:854
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
 msgstr ""
-"Propušta neželjene poruke pod sataru Ubice neželjene pošte i ovaj dodatak "
-"zahteva taj program."
+"Filtrira neželjenu poštu koristeći Ubicu spama. Ovaj dodatak zahteva njegovu "
+"ponovnu instalaciju."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "SpamAssassin junk plugin"
-msgstr "Ubica neželjene pošte (dodatak)"
+msgstr "Dodatak za neželjenu poštu Ubice spama"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "Opcije Ubica spama"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -18235,18 +18410,18 @@ msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Uvoženje podataka."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Sačekajte"
 
@@ -18264,8 +18439,16 @@ msgstr "Razvrstava poruke u raspravi prema naslovu"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
-msgstr "Vrati se na razvrstavanje poruka po nas_lovu rasprave"
+msgid "F_all back to threading messages by subject"
+msgstr "Vra_ti se na nizanje poruka po naslovu"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr "Jednostavan dodatak koji koristi ytnef za dekodiranje tnef priloga."
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr "Dekoder TNEF priloga"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -18463,23 +18646,23 @@ msgstr ""
 "koja bi se mogla uvesti. Ukoliko želite da pokušate\n"
 "ponovo, kliknite na dugme „Nazad“.\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:288
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:293
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tip datoteke:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
@@ -18527,7 +18710,7 @@ msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:584
+#: ../shell/e-shell-window-commands.c:663
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor@prevod.org>\n"
@@ -18535,19 +18718,19 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-commands.c:595
+#: ../shell/e-shell-window-commands.c:674
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-commands.c:803
+#: ../shell/e-shell-window-commands.c:882
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-commands.c:816 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:895 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ra_d van mreže"
 
-#: ../shell/e-shell-window-commands.c:829
+#: ../shell/e-shell-window-commands.c:908
 msgid "Work Offline"
 msgstr "Rad van mreže"
 
@@ -18564,7 +18747,7 @@ msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolucija trenutno nije na mreži. Pritisnite ovo dugme za rad na mreži."
 
-#: ../shell/e-shell-window.c:820
+#: ../shell/e-shell-window.c:822
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
@@ -18722,11 +18905,15 @@ msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 msgid "Disable loading of any plugins."
 msgstr "Isključuje učitavanje svih dodataka."
 
-#: ../shell/main.c:501
+#: ../shell/main.c:474
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "Isključuje okno za pregled pošte, kontakata i zaduženja."
+
+#: ../shell/main.c:503
 msgid "- The Evolution PIM and Email Client"
 msgstr "Evolucija - Lični urednik podataka i program za e-poštu"
 
-#: ../shell/main.c:514
+#: ../shell/main.c:516
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18910,16 +19097,14 @@ msgid "Select a certificate to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
 #: ../smime/gui/certificate-manager.c:147
-#, fuzzy
 msgid "All PKCS12 files"
-msgstr "PKCS12 lozinka datoteke"
+msgstr "Sve PKCS12 datoteke"
 
 #: ../smime/gui/certificate-manager.c:152
 #: ../smime/gui/certificate-manager.c:403
 #: ../smime/gui/certificate-manager.c:635
-#, fuzzy
 msgid "All files"
-msgstr "Sve lokalnefascikle"
+msgstr "Sve datoteke"
 
 #: ../smime/gui/certificate-manager.c:279
 #: ../smime/gui/certificate-manager.c:496
@@ -18942,29 +19127,22 @@ msgid "Expires"
 msgstr "Ističe"
 
 #: ../smime/gui/certificate-manager.c:398
-#, fuzzy
 msgid "All email certificate files"
-msgstr "Izdavač sertifikata e-pošte"
+msgstr "Sve datoteke sertifikata pošte"
 
 #: ../smime/gui/certificate-manager.c:505
 msgid "E-Mail Address"
 msgstr "Elektronska adresa"
 
 #: ../smime/gui/certificate-manager.c:630
-#, fuzzy
 msgid "All CA certificate files"
-msgstr "Detalji sertifikata"
+msgstr "Sve datoteke CA sertifikata"
 
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Pregledač sertifikata: %s"
 
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Unesite lozinku za ’%s‘"
-
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19490,7 +19668,7 @@ msgstr "Čuva izabrane kontakte kao VKartu."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Čuva kontakte izabrane fascikle kao VKartu."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2710
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2717
 msgid "Select All"
 msgstr "Izaberi sve"
 
@@ -19840,9 +20018,8 @@ msgid "R_ole Field"
 msgstr "_Uloga polje"
 
 #: ../ui/evolution-event-editor.xml.h:16
-#, fuzzy
 msgid "Send _Options"
-msgstr "Opcije slanja"
+msgstr "_Opcije slanja"
 
 #: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
@@ -19951,16 +20128,15 @@ msgstr "Napravi ili uredi pravila za filtriranje nove pošte"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages for Offline"
-msgstr ""
+msgstr "Pruzima poruke za rd van mreže"
 
 #: ../ui/evolution-mail-global.xml.h:8
-#, fuzzy
 msgid "Download messages for offline"
-msgstr "Fascikla nije na mreži"
+msgstr "Preuzima poruke za rad van mreže"
 
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Download messages of accounts/folders marked for offline"
-msgstr ""
+msgstr "Preuzima poruke za naloge/fascikle koje su označene za rad van mreže"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Empty _Trash"
@@ -20110,14 +20286,12 @@ msgid "Permanently remove this folder"
 msgstr "Trajno ukloni ovu fasciklu"
 
 #: ../ui/evolution-mail-list.xml.h:20
-#, fuzzy
 msgid "Re_fresh..."
-msgstr "Osveži"
+msgstr "O_sveži..."
 
 #: ../ui/evolution-mail-list.xml.h:21
-#, fuzzy
 msgid "Refresh the folder"
-msgstr "Osvežavanje fascikle"
+msgstr "Osvežava fasciklu"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select Message _Thread"
@@ -20467,9 +20641,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "Fascikla pretrage na dopisnu _listu..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
 msgid "Search Folder from Recipien_ts..."
-msgstr "Fascikla pretrage na primaoce..."
+msgstr "Fascikla pretrage od prima_laca..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -20711,41 +20884,36 @@ msgid "PGP Sign"
 msgstr "PGP potpis"
 
 #: ../ui/evolution-message-composer.xml.h:17
-#, fuzzy
 msgid "PGP _Encrypt"
-msgstr "PGP šifruj"
+msgstr "PGP _šifruj"
 
 #: ../ui/evolution-message-composer.xml.h:18
-#, fuzzy
 msgid "PGP _Sign"
-msgstr "PGP potpis"
+msgstr "PGP _potpiši"
 
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "Zahtevaj izveštai_j o dostavi"
 
 #: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "S/MIME En_crypt"
-msgstr "S/MIME šifruj"
+msgstr "S/MIME _šifruj"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME šifruj"
 
 #: ../ui/evolution-message-composer.xml.h:22
-#, fuzzy
 msgid "S/MIME Sig_n"
-msgstr "S/MIME potpis"
+msgstr "S/MIME _potpiši"
 
 #: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME potpis"
 
 #: ../ui/evolution-message-composer.xml.h:24
-#, fuzzy
 msgid "S_end"
-msgstr "Pošalji"
+msgstr "Poš_alji"
 
 #: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
@@ -21062,9 +21230,8 @@ msgid "New _Window"
 msgstr "Nov p_rozor"
 
 #: ../ui/evolution.xml.h:19
-#, fuzzy
 msgid "Page Set_up..."
-msgstr "Podešavanje strane:"
+msgstr "Po_desi stranu..."
 
 #: ../ui/evolution.xml.h:20
 msgid "Prefere_nces"
@@ -21261,7 +21428,7 @@ msgstr "Sa _stanjem"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
 msgid "UTC"
 msgstr "UTC"
 
@@ -21290,19 +21457,19 @@ msgstr ""
 "Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
 "Koristite desni taster miša za umanjivanje."
 
-#: ../widgets/menus/gal-define-views-dialog.c:84
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Zbirka"
 
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Odredi preglede za %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:374
-#: ../widgets/menus/gal-define-views-dialog.c:376
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Odredi preglede"
 
@@ -21311,19 +21478,19 @@ msgstr "Odredi preglede"
 msgid "Define Views for \"%s\""
 msgstr "Odredi preglede za „%s“"
 
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1912
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1910
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabela"
 
 # bug(slobo): instanca, primerak, pogledaj...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
 msgid "Instance"
 msgstr "Struktura"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
 msgid "Save Current View"
 msgstr "Sačuvaj trenutni pregled"
 
@@ -21336,16 +21503,16 @@ msgid "_Replace existing view"
 msgstr "_Zameni postojeći pregled"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-instance.c:582
 #: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "Čuva prilagođen pregled"
 
-#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "Odredi preglede..."
@@ -21355,33 +21522,31 @@ msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
 #: ../widgets/menus/gal-view-menus.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "Select View: %s"
-msgstr "Nedeljni pregled: %s. %s"
+msgstr "Bira pregled: %s"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Current view is a customized view"
-msgstr ""
+msgstr "Trenutan pregled je korisnik podesio"
 
 #: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
 #: ../widgets/menus/gal-view-menus.c:369
-#, fuzzy
 msgid "Save current custom view"
-msgstr "Sačuvaj trenutni pregled"
+msgstr "Čuva trenutni korisnički pregled"
 
 #: ../widgets/menus/gal-view-menus.c:383
-#, fuzzy
 msgid "Create or edit views"
-msgstr "_Napravi novi pregled"
+msgstr "Pravi ili menja preglede"
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "Proizvodnja"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "Odredi novi pregled"
 
@@ -21397,7 +21562,7 @@ msgstr "Tip pregleda"
 msgid "Type of view:"
 msgstr "Tip pregleda:"
 
-#: ../widgets/misc/e-attachment-bar.c:1019
+#: ../widgets/misc/e-attachment-bar.c:1031
 msgid "Attachment Bar"
 msgstr "Linija priloga"
 
@@ -21445,66 +21610,66 @@ msgstr "%B %Y."
 msgid "Month Calendar"
 msgstr "Mesečni kalendar"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3560
-#: ../widgets/text/e-text.c:3561
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-entry.c:1230
+#: ../widgets/text/e-entry.c:1231 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3638
 msgid "Fill color"
 msgstr "Boja ispunjavanja"
 
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1242
-#: ../widgets/text/e-entry.c:1243 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568 ../widgets/text/e-text.c:3575
-#: ../widgets/text/e-text.c:3576
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-entry.c:1237
+#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-entry.c:1244
+#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645 ../widgets/text/e-text.c:3652
+#: ../widgets/text/e-text.c:3653
 msgid "GDK fill color"
 msgstr "GDK boja ispunjavanja"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3582
-#: ../widgets/text/e-text.c:3583
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-entry.c:1251
+#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "Fill stipple"
 msgstr "Istačkaj"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "H1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-item.c:3014
 msgid "Minimum width"
 msgstr "Najmanja širina"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum Width"
 msgstr "Najmanja širina"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Razmak"
@@ -21524,7 +21689,7 @@ msgstr "Vrednost postotka mora biti između 0 i 100"
 
 #: ../widgets/misc/e-charset-picker.c:65
 msgid "Arabic"
-msgstr ""
+msgstr "arapski"
 
 #: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
@@ -21692,11 +21857,11 @@ msgstr "Element oznake"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Element koji se prikazuje umesto obične oznake stabla"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3359
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
 msgid "Expander Size"
 msgstr "Veličina stabla"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3360
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
 msgid "Size of the expander arrow"
 msgstr "Veličina strelice stabla"
 
@@ -21787,15 +21952,15 @@ msgstr "Uskladi lične zapise:"
 msgid "Sync Categories:"
 msgstr "Uskladi kategorije:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "Prazna poruka"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "Model preispunjavanja"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "Širina kolone"
 
@@ -21815,9 +21980,9 @@ msgstr "_Očisti"
 msgid "Item ID"
 msgstr "IB predmeta"
 
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1221
-#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3482
-#: ../widgets/text/e-text.c:3483
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1216
+#: ../widgets/text/e-entry.c:1217 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3560
 msgid "Text"
 msgstr "Tekst"
 
@@ -21839,26 +22004,26 @@ msgstr "P_retraži"
 msgid " i_n "
 msgstr " _u "
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Red kursora"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Kolona kursora"
 
 # bug(slobo): možda razvrstavač
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "Razvrstavanje"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "Režim izbora"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "Režim kursora"
 
@@ -22027,43 +22192,43 @@ msgstr "Dostupne _kategorije:"
 msgid "categories"
 msgstr "kategorije"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "iskačuća lista"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:387
+#: ../widgets/table/e-cell-pixbuf.c:383
 msgid "Selected Column"
 msgstr "Izabrana kolona"
 
-#: ../widgets/table/e-cell-pixbuf.c:394
+#: ../widgets/table/e-cell-pixbuf.c:390
 msgid "Focused Column"
 msgstr "Fokusirana kolona"
 
-#: ../widgets/table/e-cell-pixbuf.c:401
+#: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Unselected Column"
 msgstr "Neizabrana kolona"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1803
 msgid "Strikeout Column"
 msgstr "Precrtana kolona"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1810
 msgid "Underline Column"
 msgstr "Podvučena kolona"
 
-#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/table/e-cell-text.c:1817
 msgid "Bold Column"
 msgstr "Podebljana kolona"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1824
 msgid "Color Column"
 msgstr "Kolona u boji"
 
-#: ../widgets/table/e-cell-text.c:1837
+#: ../widgets/table/e-cell-text.c:1838
 msgid "BG Color Column"
 msgstr "Kolona boja u pozadini"
 
@@ -22078,7 +22243,7 @@ msgstr "Do_stupna polja:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Rastuće"
 
@@ -22089,7 +22254,7 @@ msgstr "Očisti sve"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Opadajuće"
 
@@ -22113,7 +22278,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "Pri_kaži ova polja redom:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:641
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Prikaži polja"
@@ -22152,27 +22317,27 @@ msgstr "Prikazana _polja..."
 msgid "_Sort..."
 msgstr "_Razvrstaj..."
 
-#: ../widgets/table/e-table-config.c:154
+#: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "Stanje"
 
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Rastuće)"
 
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Opadajuće)"
 
-#: ../widgets/table/e-table-config.c:394
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Nije razvrstano"
 
-#: ../widgets/table/e-table-config.c:435
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Bez grupisanja"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:662
 msgid "Available Fields"
 msgstr "Dostupna polja"
 
@@ -22185,21 +22350,21 @@ msgid "_Show these fields in order:"
 msgstr "_Prikaži ova polja po redu:"
 
 # Prevuci-i-Pusti
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1877
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:636
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1875
 msgid "DnD code"
 msgstr "PiP kod"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1891
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:643
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1889
 msgid "Full Header"
 msgstr "Puno zaglavlje"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "Dodaj kolonu..."
 
@@ -22231,315 +22396,403 @@ msgstr[0] "%s (%d stavka)"
 msgstr[1] "%s (%d stavke)"
 msgstr[2] "%s (%d stavki)"
 
+#: ../widgets/table/e-table-group-container.c:896
 #: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
 msgid "Alternating Row Colors"
 msgstr "Redovi naizmeničnih boja"
 
+#: ../widgets/table/e-table-group-container.c:903
 #: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3312 ../widgets/table/e-tree.c:3313
+#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
 msgid "Horizontal Draw Grid"
 msgstr "Položene linije za crtanje"
 
+#: ../widgets/table/e-table-group-container.c:910
 #: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3318 ../widgets/table/e-tree.c:3319
+#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
 msgid "Vertical Draw Grid"
 msgstr "Uspravne linije za crtanje"
 
+#: ../widgets/table/e-table-group-container.c:917
 #: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3324 ../widgets/table/e-tree.c:3325
+#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
 msgid "Draw focus"
 msgstr "Središte crtanja"
 
+#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
 msgid "Cursor mode"
 msgstr "Režim kursora"
 
+#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
 msgid "Selection model"
 msgstr "Model za izbor"
 
+#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3306
-#: ../widgets/table/e-tree.c:3307
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
+#: ../widgets/table/e-tree.c:3302
 msgid "Length Threshold"
 msgstr "Najveća dužina"
 
+#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Uniform row height"
 msgstr "Ujednačena visina redova"
 
+#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "Zamrznuto"
 
-#: ../widgets/table/e-table-header-item.c:1457
+#: ../widgets/table/e-table-header-item.c:1456
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../widgets/table/e-table-header-item.c:1477
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Sort _Ascending"
-msgstr "Rastuće razvrstavanje"
+msgstr "Razvrstaj _rastuće"
 
-#: ../widgets/table/e-table-header-item.c:1478
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Sort _Descending"
-msgstr "Opadajuće razvrstavanje"
+msgstr "Razvrstaj _opadajuće"
 
-#: ../widgets/table/e-table-header-item.c:1479
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "_Unsort"
-msgstr "Ne razvrstavaj"
+msgstr "_Ne razvrstavaj"
 
-#: ../widgets/table/e-table-header-item.c:1481
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Group By This _Field"
-msgstr "Grupiši po ovome polju"
+msgstr "Grupiši po ovome _polju"
 
-#: ../widgets/table/e-table-header-item.c:1482
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Group By _Box"
-msgstr "Grupiši po okviru"
+msgstr "Grupiši po _okviru"
 
-#: ../widgets/table/e-table-header-item.c:1484
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Remove This _Column"
-msgstr "Ukloni ovu kolonu"
+msgstr "Ukloni ovu _kolonu"
 
-#: ../widgets/table/e-table-header-item.c:1485
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Add a C_olumn..."
-msgstr "Dodaj kolonu..."
+msgstr "Dodaj ko_lonu..."
 
-#: ../widgets/table/e-table-header-item.c:1487
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "A_lignment"
-msgstr "Poravnanje"
+msgstr "Po_ravnanje"
 
-#: ../widgets/table/e-table-header-item.c:1488
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "B_est Fit"
-msgstr "Najbolje uklapanje"
+msgstr "Na_jbolje uklapanje"
 
-#: ../widgets/table/e-table-header-item.c:1489
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Format Column_s..."
-msgstr "Formatiraj kolone..."
+msgstr "Oblikuj kolo_ne..."
 
-#: ../widgets/table/e-table-header-item.c:1491
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Custo_mize Current View..."
-msgstr "Prilagodi trenutni pregled..."
+msgstr "Prila_godi trenutni pregled..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1540
 msgid "Sort By"
 msgstr "Poredaj po"
 
-#: ../widgets/table/e-table-header-item.c:1884
+#: ../widgets/table/e-table-header-item.c:1882
 msgid "Font Description"
 msgstr "Opis fonta"
 
-#: ../widgets/table/e-table-header-item.c:1905
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1903
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Detalji razvrstavanja"
 
-#: ../widgets/table/e-table-header-item.c:1919
-#: ../widgets/table/e-tree-scrolled.c:231
-#: ../widgets/table/e-tree-scrolled.c:232
+#: ../widgets/table/e-table-header-item.c:1917
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Stablo"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
 msgid "Table header"
 msgstr "Zaglavlje tabele"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
 msgid "Table model"
 msgstr "Model tabele"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
 msgid "Cursor row"
 msgstr "Red kursora"
 
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3345
-#: ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-tree.c:3341
 msgid "Always search"
 msgstr "Uvek pretraži"
 
-#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "Koristite klik da dodate"
 
-#: ../widgets/table/e-tree.c:3331 ../widgets/table/e-tree.c:3332
+#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
 msgid "ETree table adapter"
 msgstr "ETree prilagođivač tabele"
 
-#: ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-tree.c:3347
 msgid "Retro Look"
 msgstr "Starinski izgled"
 
-#: ../widgets/table/e-tree.c:3353
+#: ../widgets/table/e-tree.c:3348
 msgid "Draw lines and +/- expanders."
 msgstr "Iscrtava linije i +/- graničnike."
 
-#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
-#: ../widgets/text/e-text.c:3475 ../widgets/text/e-text.c:3476
+#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
+#: ../widgets/text/e-text.c:3552 ../widgets/text/e-text.c:3553
 msgid "Event Processor"
 msgstr "Obrađivač događaja"
 
-#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-entry.c:1223 ../widgets/text/e-entry.c:1224
+#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
 msgid "Justification"
 msgstr "Obostrano"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-entry.c:1265 ../widgets/text/e-entry.c:1266
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Use ellipsis"
 msgstr "Koristi tri tačke"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Ellipsis"
 msgstr "Tri tačke"
 
-#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Line wrap"
 msgstr "Prelom reda"
 
-#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Break characters"
 msgstr "Znaci za prelom"
 
-#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Max lines"
 msgstr "Najviše linija"
 
-#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3668 ../widgets/text/e-text.c:3669
+#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Allow newlines"
 msgstr "Dozvoli nove linije"
 
-#: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3661 ../widgets/text/e-text.c:3662
+#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Draw borders"
 msgstr "Iscrtaj ivice"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Draw background"
 msgstr "Iscrtaj pozadinu"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw button"
 msgstr "Iscrtaj dugme"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Cursor position"
 msgstr "Pozicija kurzora"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
 msgid "Emulate label resize"
 msgstr "Oponašaj promenu veličine oznake"
 
-#: ../widgets/text/e-text.c:2722
+#: ../widgets/text/e-text.c:2729
 msgid "Input Methods"
 msgstr "Metodi unosa"
 
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../widgets/text/e-text.c:3566 ../widgets/text/e-text.c:3567
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Strikeout"
 msgstr "Precrtano"
 
-#: ../widgets/text/e-text.c:3503 ../widgets/text/e-text.c:3504
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Anchor"
 msgstr "Veza"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Clip Width"
 msgstr "Iseci širinu"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Height"
 msgstr "Iseci visinu"
 
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip"
 msgstr "Iseci"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Fill clip rectangle"
 msgstr "Ispuni pravougaonik isečka"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "X Offset"
 msgstr "X pomeranje"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "Y Offset"
 msgstr "Y pomeranje"
 
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3590
+#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
 msgid "Text width"
 msgstr "Širina teksta"
 
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text height"
 msgstr "Visina teksta"
 
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "IM Context"
 msgstr "Kontekst metoda unosa"
 
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
 msgid "Handle Popup"
 msgstr "Upravljaj iskačućim prozorom"
 
+#~ msgid "A Folder with this name already exists"
+#~ msgstr "Jedna fascikla sa tim imenom već postoji"
+
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "Promenjena elektronska adresa ili ime ovog kontakta\n"
+#~ "već postoji u ovoj fascikli.  Želite li ipak da dodate?"
+
+#~ msgid ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "Svi podaci u ovim unosima u dnevnik će biti obrisani i neće se moći "
+#~ "povratiti."
+
+#~ msgid ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "Svi podaci o ovom unosu u dnevnik će biti obrisani i neće se moći "
+#~ "povratiti."
+
+#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgstr "Sigurno želite da obrišete unos u dnevnik ’{0}‘?"
+
+# bug: plural-forms
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "Sigurno želite da obrišete ove {0} unose u dnevnik?"
+
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "Sigurno želite da obrišete ovaj unos u dnevnik?"
+
+#~ msgid ""
+#~ "If you do not send a cancelation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgstr ""
+#~ "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
+#~ "znati da je dnevnik obrisan."
+
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "Ovaj unos u dnevnik je obrisan."
+
+#~ msgid "This journal entry has been changed."
+#~ msgstr "Ovaj unos u dnevnik je promenjen."
+
+#~ msgid "Journal entry - %s"
+#~ msgstr "Unos u dnevnik - %s"
+
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
+
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr "Unos u dnevnik nije mogao biti obrisan jer pristup nije dozvoljen"
+
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "Unos u dnevnik nije mogao biti obrisan usled greške"
+
+# povratni > redovni
+#~ msgid ""
+#~ "You are modifying a recurring journal entry. What would you like to "
+#~ "modify?"
+#~ msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
+
+#~ msgid "Journal information"
+#~ msgstr "Podatak o dnevniku"
+
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>Onda</b>"
+
+#~ msgid "Valid signature, cannot verify sender"
+#~ msgstr "Ispravan potpis, nije moguća provera pošiljaoca"
+
+#~ msgid "Mark as _Read"
+#~ msgstr "O_znači kao pročitano"
+
+#~ msgid "_Do not Mark as Read"
+#~ msgstr "Os_tavi nepročitano"
+
+#~ msgid "Check Evolution archive"
+#~ msgstr "Proverava arhivu Evolucije"
+
+#, fuzzy
+#~ msgid "With GUI"
+#~ msgstr "Širina"
+
+#~ msgid "<b>Junk Mail Settings</b>"
+#~ msgstr "<b>Podešavanja pošte za đubre</b>"
+
+#~ msgid "<b>Subject</b> :"
+#~ msgstr "<b>Naslov</b>"
+
+#~ msgid "<b>From</b> :"
+#~ msgstr "<b>Šalje</b>"
+
+#~ msgid "Unable to find this journal entry in any journal"
+#~ msgstr "Ne mogu da pronađem ovaj unos u nijednom dnevniku"
+
 #~ msgid "_Address: "
 #~ msgstr "_Adresa:"
 
@@ -22855,86 +23108,3 @@ msgstr "Upravljaj iskačućim prozorom"
 
 #~ msgid "..."
 #~ msgstr "..."
-
-# strftime format of a time in 24-hour format,
-# without seconds.
-# This is a strftime() format. %H = hour (0-23), %M = minute.
-#~ msgid "%H:%M"
-#~ msgstr "%H:%M"
-
-# in 12-hour format.
-# strftime format of a time in 12-hour format,
-# without seconds.
-# This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#~ msgid "%I:%M %p"
-#~ msgstr "%I:%M %p"
-
-#~ msgid "Minicard Test"
-#~ msgstr "Proba minikarte"
-
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Autorsko pravo (C) 2000, Helix Code, Inc."
-
-#~ msgid "This should test the minicard canvas item"
-#~ msgstr "Ovo isprobava polje minikarte"
-
-#~ msgid "Print Preview"
-#~ msgstr "Pregled pred štampu"
-
-#~ msgid "Fo_rward"
-#~ msgstr "Pros_ledi"
-
-#~ msgid "Printer settings"
-#~ msgstr "Podešavanja štampača"
-
-#~ msgid "Fontset"
-#~ msgstr "Skup slovnih likova"
-
-#~ msgid "Font"
-#~ msgstr "Slovni lik"
-
-#~ msgid "GDKFont"
-#~ msgstr "GDK slovni lik"
-
-#~ msgid "_Send New Message To ..."
-#~ msgstr "_Pošalji poruku za..."
-
-#~ msgid "Importing ..."
-#~ msgstr "Uvoženje ..."
-
-#~ msgid "Su_mmary"
-#~ msgstr "U kratkim crtama:"
-
-#~ msgid "_Memo Content:"
-#~ msgstr "_Sadržaj beleške:"
-
-#~ msgid ""
-#~ "A file by that name already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Datoteka toga imena već postoji.\n"
-#~ "Prepisati je?"
-
-#~ msgid "Filtering Folder"
-#~ msgstr "Filtriranje fascikle"
-
-#~ msgid "ok_button"
-#~ msgstr "Dugme „U redu“"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Video konferencije"
-
-#~ msgid "work"
-#~ msgstr "posao"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "personal"
-#~ msgstr "lično"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "Kalendar koji ste izabrali je samo za razgledanje"