Updates to Serbian translations.

svn path=/trunk/; revision=33826

3 files changed, 7352 insertions, 5975 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 0337dd4bd0..589696c55d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-21  Danilo Šegan  <danilo@gnome.org>
+
+	* sr.po, sr@Latn.po: Bugfixes.
+
 2007-07-20  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated.
diff --git a/po/sr.po b/po/sr.po
index 348a5ebd82..fa5fca01bf 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-12 14:22+0100\n"
-"PO-Revision-Date: 2007-03-12 11:33+0100\n"
+"POT-Creation-Date: 2007-07-21 03:24+0100\n"
+"PO-Revision-Date: 2007-07-21 13:46+0200\n"
 "Last-Translator: Игор Несторовић <igor@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,21 +30,21 @@ msgstr ""
 # note(slobo): spam , Ђубре --> Нежељена пошта
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "еволуцијин именик"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Нови контакт"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Нова контакт листа"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -164,7 +164,7 @@ msgid "calendar view for one or more days"
 msgstr "преглед календара за један или више дана"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:726
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -180,7 +180,7 @@ 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:710
+#: ../calendar/gui/calendar-component.c:729
 #: ../calendar/gui/e-day-view-top-item.c:1315
 #: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
@@ -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:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:731
+#: ../calendar/gui/calendar-component.c:736
+#: ../calendar/gui/calendar-component.c:738
 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:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:765
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -218,7 +218,7 @@ 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:736
+#: ../calendar/gui/calendar-component.c:755
 #: ../calendar/gui/e-day-view-top-item.c:1319
 #: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
@@ -275,11 +275,11 @@ msgstr "искачуће"
 msgid "popup a child"
 msgstr "искачуће изведено"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "уређивање"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "почиње уређивањем ове ћелије"
 
@@ -326,17 +326,17 @@ msgstr "клик"
 msgid "sort"
 msgstr "разврставање"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%d %B %Y."
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Календар: од %s до %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "предмет еволуција календара"
 
@@ -426,7 +426,7 @@ msgstr "Неуспела аутентификација на LDAP сервер."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
 msgid "Failed to delete contact"
 msgstr "Неуспело брисање контакта"
 
@@ -544,7 +544,7 @@ msgid ""
 msgstr ""
 "Ваши контакти за {0} неће бити доступни док се Еволуција поново не покрене."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
@@ -570,7 +570,7 @@ msgstr "_Користи тако како је"
 # bug: we don't want this translated
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
@@ -580,17 +580,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Подразумевана адреса за усклађивање:"
 
-#: ../addressbook/conduit/address-conduit.c:1317
-#: ../addressbook/conduit/address-conduit.c:1318
+#: ../addressbook/conduit/address-conduit.c:1315
+#: ../addressbook/conduit/address-conduit.c:1316
 msgid "Could not load addressbook"
 msgstr "Није могуће отворити именик"
 
-#: ../addressbook/conduit/address-conduit.c:1395
-#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1393
+#: ../addressbook/conduit/address-conduit.c:1396
 msgid "Could not read pilot's Address application block"
 msgstr "Није могуће читање програмског блока адреса пилота"
 
@@ -612,9 +612,9 @@ msgstr "Подесите самодопуњавање овде"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:277 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -653,12 +653,12 @@ msgstr "Управљајте S/MIME сертификатима овде"
 # On This Computer is always first and VFolders is always last
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:488
+#: ../calendar/gui/calendar-component.c:236
+#: ../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
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
@@ -672,54 +672,54 @@ msgstr "На овом рачунару"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:496
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../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/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
 msgid "Personal"
 msgstr "Лично"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:506
 msgid "On LDAP Servers"
 msgstr "На LDAP серверима"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Направи нови контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "Контакт ли_ста"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Направи нову контакт листу"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1208
 msgid "New Address Book"
 msgstr "Нови именик"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "_Именик"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Направи нови именик"
 
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Неуспела надоградња подешавања именика или његових фасцикли."
 
@@ -728,8 +728,7 @@ msgid "Base"
 msgstr "База"
 
 #: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "_Тип:"
 
@@ -740,17 +739,17 @@ msgstr "Умножава садржај књиге локално за рад в
 #: ../addressbook/gui/component/addressbook-config.c:984
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2087
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Опште"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
+#: ../addressbook/gui/widgets/e-addressbook-view.c:565
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Именик"
@@ -770,7 +769,7 @@ msgid "Details"
 msgstr "Детаљи"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../mail/em-folder-browser.c:849
 msgid "Searching"
 msgstr "Претраживање"
 
@@ -778,31 +777,31 @@ msgstr "Претраживање"
 msgid "Downloading"
 msgstr "Преузимање"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1206
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Подешавања именика"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "Преношење..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Преношење ’%s‘:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:634
 msgid "LDAP Servers"
 msgstr "LDAP сервери"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:749
 msgid "Autocompletion Settings"
 msgstr "Подешавања самодопуњавања"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1124
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -814,7 +813,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1138
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -824,7 +823,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1147
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -834,7 +833,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -870,14 +869,14 @@ msgstr "_Нови именик"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:990
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1148
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Обриши"
@@ -887,12 +886,12 @@ msgid "Save As Vcard..."
 msgstr "Сачувај као ВКарту..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
+#: ../calendar/gui/calendar-component.c:591
+#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
 msgid "_Properties..."
 msgstr "По_дешавања..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "Бирач извора за контакте"
 
@@ -901,29 +900,29 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимно приступање LDAP серверу"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:513
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:507
 msgid "Failed to authenticate.\n"
 msgstr "Неуспела аутентификација.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:493
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:487
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Унесите лозинку за %s (корисник %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Дужина самодопуњавања"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML за листу адреса за допуњавање"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML за листу адреса за допуњавање."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
@@ -931,11 +930,11 @@ msgstr ""
 "Положај усправне површи, између карте и листе прегледа и панела за преглед, "
 "у пикселима."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "Прикажи површ за преглед"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -943,20 +942,20 @@ msgstr ""
 "Број знакова који се морају укуцати пре него што Еволуција покуша да "
 "самодопуни."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Адреса за последњу коришћену фасциклу у прозорчету за избор имена"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Адреса за последњу коришћену фасциклу у прозорчету за избор имена."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Положај усправне површи"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Да ли се приказује површ за преглед."
 
@@ -981,7 +980,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>Аутентификација</b>"
 
@@ -1228,9 +1226,8 @@ msgid "_Login method:"
 msgstr "Метод _пријаве:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:225
+#: ../mail/mail-config.glade.h:169
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Име:"
@@ -1244,7 +1241,7 @@ msgid "_Search scope:"
 msgstr "Обим п_ретраге:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:176
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "С_ервер:"
@@ -1264,12 +1261,11 @@ msgstr "карте"
 # bug: plural-forms
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../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
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/calendar-weather/calendar-weather.c:561
 msgid "minutes"
 msgstr "минута"
 
@@ -1310,13 +1306,13 @@ msgid "<b>Work</b>"
 msgstr "<b>Посао</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:194
@@ -1324,9 +1320,9 @@ msgid "Contact"
 msgstr "Контакт"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../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
 msgid "Contact Editor"
 msgstr "Уређивач за контакте"
 
@@ -1367,16 +1363,17 @@ msgstr "Телефон"
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:155
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Посао"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
 msgstr "_Адреса:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
@@ -1392,9 +1389,9 @@ msgid "_Birthday:"
 msgstr "_Рођендан:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:888
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1833
 msgid "_Calendar:"
 msgstr "_Календар:"
 
@@ -1487,26 +1484,26 @@ msgid "_Zip/Postal Code:"
 msgstr "Пош_тански број:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
 msgid "Address"
 msgstr "Адреса"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../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:1833 ../widgets/text/e-entry.c:1265
-#: ../widgets/text/e-entry.c:1266 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../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
 msgid "Editable"
 msgstr "Изменљиво"
 
@@ -2480,10 +2477,11 @@ msgid "Zimbabwe"
 msgstr "Зимбабве"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:354
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Име"
@@ -2493,8 +2491,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL брзи гласник"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Jabber"
 msgstr "Џабер"
 
@@ -2507,8 +2505,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu'Gadu гласник"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2528,72 +2526,72 @@ msgid "Username"
 msgstr "Корисничко име"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Кућа"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Друго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Изворна књига"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Одредишна књига"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Је нови контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Поља за упис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Обавезна поља"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Промењено"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уређивач за контакте - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
 msgid "Please select an image for this contact"
 msgstr "Изаберите слику за овај контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
 msgid "_No image"
 msgstr "_Без слике"
 
@@ -2625,23 +2623,23 @@ msgstr "%s„%s“ је празан"
 msgid "Invalid contact."
 msgstr "Неисправан контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:297
 msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
 msgid "_Full name"
 msgstr "_Име и презиме"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:349
 msgid "E_mail"
 msgstr "Е-_пошта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:360
 msgid "_Select Address Book"
 msgstr "_Изабери именик"
 
@@ -2695,10 +2693,6 @@ msgstr "Држав_а:"
 msgid "Full Address"
 msgstr "Пуна адреса"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "_Адреса:"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Поштански број:"
@@ -2712,7 +2706,7 @@ msgid "Esq."
 msgstr "Пош."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Пуно име"
 
@@ -2784,7 +2778,7 @@ msgstr "Услуга _брзог гласника:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Место:"
 
@@ -2830,9 +2824,9 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Укуцајте електронску адресу или превуците контакт у доњу листу:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
@@ -2887,27 +2881,47 @@ msgstr ""
 "Име или електронска адреса овог контакта већ постоји\n"
 "у овој фасцикли.  Желите ли ипак да додате?"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#, fuzzy
+msgid "Merge Contact"
+msgstr "Нови контакт"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#, fuzzy
+msgid "Merge"
+msgstr "Порука"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "Е-пошта"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Name begins with"
 msgstr "Име почиње са"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "Нема контакта"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2915,38 +2929,37 @@ msgstr[0] "%d контакт"
 msgstr[1] "%d контакта"
 msgstr[2] "%d контаката"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:239
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "Упит"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Грешка при учитавању прегледа књиге"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../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:3337
+#: ../widgets/table/e-table.c:3340
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
+#: ../widgets/text/e-text.c:3468 ../widgets/text/e-text.c:3469
 msgid "Model"
 msgstr "Модел"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 msgid "Source"
 msgstr "Извор"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:246
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:500
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2954,77 +2967,77 @@ msgstr "Извор"
 msgid "Type"
 msgstr "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:838
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2049
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Сачувај као ВКарту..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:961
 msgid "_New Contact..."
 msgstr "Нови кон_такт..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
 msgid "New Contact _List..."
 msgstr "Нови контакт _списак..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Save as VCard..."
 msgstr "_Сачувај као ВКарту..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "_Forward Contact"
 msgstr "Просле_ди контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "_Forward Contacts"
 msgstr "Проследи конт_акте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contact"
 msgstr "Пошаљи поруку ко_нтакту"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "Send _Message to List"
 msgstr "Пошаљи поруку на _листу"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
 msgid "Send _Message to Contacts"
 msgstr "Пошаљи по_руку контактима"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "_Print"
 msgstr "Шта_мпај"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
 msgid "Cop_y to Address Book..."
 msgstr "Умножи у и_меник..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 msgid "Mo_ve to Address Book..."
 msgstr "Премести у имени_к..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:988
-#: ../calendar/gui/calendar-component.c:583
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:589
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3185 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1134 ../mail/message-list.c:1922
+#: ../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
 #: ../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
@@ -3032,30 +3045,25 @@ msgstr "_Исеци"
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
 msgid "P_aste"
 msgstr "_Убаци"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1636
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
 msgid "Any Category"
 msgstr "Било која категорија"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1871
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1927
-msgid "Print cards"
-msgstr "Штампај карте"
-
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Other error"
 msgstr "Друга грешка"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Assistant"
 msgstr "Помоћник"
 
@@ -3092,84 +3100,79 @@ msgid "Categories"
 msgstr "Категорије"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Телефон предузећа"
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#, fuzzy
+msgid "Company"
+msgstr "Пр_едузеће:"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "Е-пошта"
+msgid "Company Phone"
+msgstr "Телефон предузећа"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Презиме"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Смести као"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Дато име"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Кућни факс"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Кућни телефон"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Кућни телефон 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN телефон"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Дневник"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Manager"
 msgstr "Управник"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Nickname"
 msgstr "Надимак"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "Note"
 msgstr "Напомена"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Канцеларија"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "Организација"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Други факс"
@@ -3191,7 +3194,6 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
 #: ../calendar/gui/e-meeting-list-view.c:511
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
@@ -3199,7 +3201,7 @@ msgid "Role"
 msgstr "Улога"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Spouse"
 msgstr "Супружник"
 
@@ -3241,7 +3243,7 @@ msgstr "Веб страна"
 #: ../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:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 msgid "Width"
 msgstr "Ширина"
 
@@ -3256,7 +3258,7 @@ msgstr "Ширина"
 #: ../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:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
 msgid "Height"
 msgstr "Висина"
 
@@ -3357,143 +3359,140 @@ msgstr "Изабрано"
 msgid "Has Cursor"
 msgstr "Има курсор"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:630
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у читачу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2545
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2602
 msgid "_Copy Link Location"
 msgstr "_Умножи место везе"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:631
 msgid "_Send New Message To..."
 msgstr "_Пошаљи поруку за..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Умножи електронску _адресу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
 msgid "(map)"
 msgstr "(мапа)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "map"
 msgstr "мапа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:456
+#: ../addressbook/gui/widgets/eab-contact-display.c:758
 msgid "List Members"
 msgstr "Чланови листе"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "Е-пошта"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Department"
 msgstr "_Одељење:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Profession"
 msgstr "_Занимање:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Position"
 msgstr "Положај"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Video Chat"
 msgstr "_Видео разговор:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2305
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../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
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../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
+#: ../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/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
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:370
+#: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Слободно/заузето"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home Page"
 msgstr "_Лична страна:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
 msgid "Web Log"
 msgstr "_Веб лог:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Birthday"
 msgstr "_Рођендан:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Anniversary"
 msgstr "_Годишњица:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:776
 msgid "Job Title"
 msgstr "Титула на послу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
 msgid "Home page"
 msgstr "Лична страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
 msgid "Blog"
 msgstr "Блог"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Success"
 msgstr "Успех"
 
 # E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Backend busy"
 msgstr "Основни процес је заузет"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Repository offline"
 msgstr "Архива ван мреже"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Address Book does not exist"
 msgstr "Именик не постоји"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "No Self Contact defined"
 msgstr "Лични контакт није дефинисан"
 
@@ -3502,75 +3501,75 @@ msgstr "Лични контакт није дефинисан"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Забрањен приступ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact not found"
 msgstr "Контакт није пронађен"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact ID already exists"
 msgstr "ИБ контакта већ постоји"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Protocol not supported"
 msgstr "Протокол није подржан"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2516
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
 msgid "Canceled"
 msgstr "Отказано"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Could not cancel"
 msgstr "Није могуће одустати"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Неуспела аутентификација"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Authentication Required"
 msgstr "Аутентификација обавезна"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "TLS not Available"
 msgstr "TLS није доступан"
 
 # E_BOOK_ERROR_NO_SUCH_SOURCE
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "No such source"
 msgstr "Нема таквог извора"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Not available in offline mode"
 msgstr "Није доступно у режиму ван мреже"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Invalid server version"
 msgstr "Неисправна верзија сервера"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:95
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3580,7 +3579,7 @@ msgstr ""
 "коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте овај "
 "именик када се повежете ради преузимања његовог садржаја"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3589,7 +3588,7 @@ msgstr ""
 "Отварање овог именика није могуће.  Проверите да путања %s постоји и да "
 "имате права приступа."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3597,7 +3596,7 @@ msgstr ""
 "Отварање овог именика није могуће.  То значи да сте или унели погрешну "
 "адресу, или је LDAP сервер недоступан."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3607,7 +3606,7 @@ msgstr ""
 "користите LDAP у Еволуцији, морате да инсталирате пакет Еволуције са "
 "подршком за LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3615,7 +3614,7 @@ msgstr ""
 "Отварање овог именика није могуће.  То значи да сте или унели погрешну "
 "адресу, или је сервер недоступан."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3627,7 +3626,7 @@ msgstr ""
 "Прецизније обликујте упит или повећајте ограничење\n"
 "броја резултата у поставкама именика за сервер директоријума."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3639,45 +3638,45 @@ msgstr ""
 "упит или повећајте временско ограничење у поставкама именика\n"
 "за сервер директоријума."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Основни процес овог именика није могао да обради упит."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Основни процес овог именика је одбио да обави овај упит."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "This query did not complete successfully."
 msgstr "Овај упит није успешно завршен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error adding list"
 msgstr "Грешка при додавању листе"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Error adding contact"
 msgstr "Грешка при додавању контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying list"
 msgstr "Грешка при измени листе"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying contact"
 msgstr "Грешка при измени контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error removing list"
 msgstr "Грешка при уклањању листе"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:660
 msgid "Error removing contact"
 msgstr "Грешка при уклањању контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:293
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3696,7 +3695,7 @@ msgstr[2] ""
 "Да ли заиста желите да прикажете ове контакте?"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3705,15 +3704,15 @@ msgstr ""
 "%s већ постоји\n"
 "Желите ли да препишете?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:329
 msgid "Overwrite"
 msgstr "Препиши"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
@@ -3721,49 +3720,49 @@ msgstr[1] "контакти"
 msgstr[2] "контакта"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:464
 msgid "Select Address Book"
 msgstr "Изабери именик"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:605
 msgid "list"
 msgstr "листа"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:771
 msgid "Move contact to"
 msgstr "Премести контакт у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Copy contact to"
 msgstr "Умножи контакт у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
 msgid "Move contacts to"
 msgstr "Премести контакте у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
+#: ../addressbook/gui/widgets/eab-gui-util.c:778
 msgid "Copy contacts to"
 msgstr "Умножи контакте у"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 msgid "Multiple VCards"
 msgstr "Бројне ВКарте"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
 #, c-format
 msgid "VCard for %s"
 msgstr "ВКарта за %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1048
+#: ../addressbook/gui/widgets/eab-gui-util.c:1066
 msgid "Contact information"
 msgstr "Контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#: ../addressbook/gui/widgets/eab-gui-util.c:1068
 #, c-format
 msgid "Contact information for %s"
 msgstr "Контакт подаци за %s"
@@ -3772,7 +3771,7 @@ msgstr "Контакт подаци за %s"
 msgid "Querying Address Book..."
 msgstr "Слање упита именику..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3780,16 +3779,16 @@ msgstr[0] "Постоји још %d контакт."
 msgstr[1] "Постоји још %d контакта."
 msgstr[2] "Постоји још %d контакта."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:281
 msgid "Show Full VCard"
 msgstr "Прикажи пуну ВКарту"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
 msgid "Show Compact VCard"
 msgstr "Прикажи сажету ВКарту"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:286
 msgid "Save in addressbook"
 msgstr "Сачувај у именик"
 
@@ -3797,17 +3796,11 @@ msgstr "Сачувај у именик"
 msgid "Card View"
 msgstr "Преглед карте"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Преглед GTK стабла"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Увожење..."
 
@@ -3851,20 +3844,6 @@ msgstr "ВКарта (.vcf, .gcrd)"
 msgid "Evolution VCard Importer"
 msgstr "Еволуција ВКарта увозник"
 
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Штампај коверту"
-
-#: ../addressbook/printing/e-contact-print.c:856
-msgid "Print contacts"
-msgstr "Штампај контакте"
-
-#: ../addressbook/printing/e-contact-print.c:882
-#: ../addressbook/printing/e-contact-print.c:909
-msgid "Print contact"
-msgstr "Штампај контакт"
-
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 п. Тахома"
@@ -3910,7 +3889,7 @@ msgstr "Формат"
 #: ../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:1895
+#: ../widgets/table/e-table-header-item.c:1898
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Заглавље"
@@ -3964,7 +3943,6 @@ msgid "Options"
 msgstr "Опције"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Положај"
 
@@ -4014,9 +3992,9 @@ msgstr "Сенчење"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:963
 #: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Величина:"
 
@@ -4033,7 +4011,7 @@ msgid "Top:"
 msgstr "Врх:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "Тип:"
 
@@ -4050,7 +4028,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "Проба уређивача стила за штампање контакта"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:47
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Ауторско право (C) 2000, Ximian, Inc."
 
@@ -4058,16 +4036,16 @@ msgstr "Ауторско право (C) 2000, Ximian, Inc."
 msgid "This should test the contact print style editor widget"
 msgstr "Ово испробава елемент уређивача стила за штампање контакта"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:46
 msgid "Contact Print Test"
 msgstr "Проба штампе контакта"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:49
 msgid "This should test the contact print code"
 msgstr "Ово испробава код за штампу контакта"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Датотека не може бити отворена"
@@ -4080,76 +4058,66 @@ msgstr "Листа именика није доступна"
 msgid "failed to open book"
 msgstr "неуспело отварање књиге"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "ИЗЛАЗНА-ДАТОТЕКА"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "List local addressbook folders"
 msgstr "Листа фасцикле локалног именика"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "Прикажи карте као вкарту или csv датотеку"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "Извези у неусклађеном режиму"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
+#, fuzzy
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr ""
 "Број карти у једној излазној датотеци у неусклађеном режиму, подразумевано "
 "100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "БРОЈ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Грешка у аргументима команде, користите опцију --help да видите како се "
 "користи."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "Подржава само csv или vcard облик."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "У неусклађеном режиму, излаз мора бити датотека."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "У нормалном режиму, нема потребе за подешавањем величине."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "Непозната грешка"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Грешка при учитавању подразумеваног именика."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Улазна датотека"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Име датотеке није дато."
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
@@ -4265,46 +4233,51 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Сигурно желите да обришете ово задужење?"
 
 #: ../calendar/calendar.error.xml.h:21
+#, fuzzy
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Сигурно желите да пошаљете задужење без сачињеног прегледа?"
+
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Сигурно желите да закажете састанак без сачињеног прегледа?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Сигурно желите да пошаљете задужење без сачињеног прегледа?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:24
 msgid "Cannot create a new event"
 msgstr "Не могу направити један нови догађај"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "Обрисати календар ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Delete memo list '{0}'?"
 msgstr "Обрисати списак белешки „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "Обрисати списак задужења ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Do _not Send"
 msgstr "Не шаљ_и"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Преузимање у току. Желите ли да сачувате заказани састанак?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Преузимање у току. Желите ли да сачувате задужење?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Уређивач није могао бити учитан."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4313,26 +4286,26 @@ msgstr ""
 "задужење."
 
 # bug: what's RSVP?
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Позивнице ће бити послате е-поштом свим учесницима и омогућиће им да "
 "одговоре."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "Грешка при учитавању календара"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading memo list"
 msgstr "Грешка при учитавању списка белешки"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Грешка при учитавању списка задужења"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../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."
@@ -4340,7 +4313,7 @@ msgstr ""
 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 "знати да је дневник обрисан."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../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."
@@ -4348,7 +4321,7 @@ msgstr ""
 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 "знати да је састанак отказан."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4356,7 +4329,7 @@ msgstr ""
 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 "знати да је задужење обрисано."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4364,7 +4337,7 @@ msgstr ""
 "Слање освежених података омогућава осталим учесницима да њихов календар буде "
 "у току."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4372,7 +4345,7 @@ msgstr ""
 "Слање освежених података омогућава осталим учесницима да њихов списак "
 "задужења буде у току."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4380,7 +4353,7 @@ msgstr ""
 "Преузима се неколико прилога. Уколико сада сачувате заказани састанак ови "
 "прилози неће бити сачувани са њим."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4388,84 +4361,84 @@ msgstr ""
 "Преузимање неколико прилога је у току. Уколико сада сачувате задужење ови "
 "прилози неће бити сачувани са њим."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server."
 msgstr "На текућој верзији сервера неке могућности можда неће исправно радити"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календар Еволуције је неочекивано завршио."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Календар Еволуције је неочекивано завршио."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Еволуција задужења су неочекивано завршила."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid "The calendar is not marked for offline usage."
 msgstr "Овај календар није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "The memo list is not marked for offline usage"
 msgstr "Овај списак белешки није означен за коришћење ван мреже"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "The task list is not marked for offline usage."
 msgstr "Списак задужења није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "This calendar will be removed permanently."
 msgstr "Овај календар ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "This memo list will be removed permanently."
 msgstr "Овај списак белешки ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "This task list will be removed permanently."
 msgstr "Овај списак задужења ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Желите ли да сачувате промене на заказаном састанку?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this memo?"
 msgstr "Желите ли да сачувате промене у овим белешкама?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this task?"
 msgstr "Желите ли да сачувате промене на задужењу?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "Желите ли да пошаљете обавештење о отказивању за овај унос у дневник?"
 
 # calendar:prompt-cancel-task primary
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Желите ли да пошаљете свим учесницима обавештење о отказивању?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Желите ли да пошаљете позиве на састанак учесницима?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send this task to participants?"
 msgstr "Желите ли да пошаљете ово задужење учесницима?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Желите ли да пошаљете освежене податке о састанку учесницима?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated task information to participants?"
 msgstr "Желите ли да пошаљете освежене податке о задужењу учесницима?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4474,7 +4447,7 @@ msgstr ""
 "Повезујете се на неподржан GroupWise сервер што може да доведе до проблема у "
 "раду Еволуције. Најбоље је да сервер буде надограђен на подржану верзију."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
@@ -4482,111 +4455,110 @@ msgstr ""
 "Изабрали сте извор календара који је само за читање. Промените на Преглед "
 "календара и назначите календар који може прихватити састанке."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Променили сте овај заказани састанак, али промене још нисте сачували."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have changed this task, but not yet saved it."
 msgstr "Променили сте ово задужење, али промене још нисте сачували."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Променили сте ову белешку, али промене још нисте сачували."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Календари неће бити доступни док се Еволуција поново не покрене."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Белешка неће бити доступна док се Еволуција поново не покрене."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Задужења неће бити доступна док се Еволуција поново не покрене."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Занемари промене"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "_Save Changes"
 msgstr "Сачувај про_мене"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "_Send Notice"
 msgstr "Пошаљи по_дсетник"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Унесите лозинку"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:253
 msgid "Split Multi-Day Events:"
 msgstr "Подели вишедневне догађаје:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1506
-#: ../calendar/conduits/calendar/calendar-conduit.c:1507
-#: ../calendar/conduits/memo/memo-conduit.c:932
-#: ../calendar/conduits/memo/memo-conduit.c:933
-#: ../calendar/conduits/todo/todo-conduit.c:1108
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../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
 msgid "Could not start evolution-data-server"
 msgstr "Неуспело покретање еволуција-сервера-података"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1614
-#: ../calendar/conduits/calendar/calendar-conduit.c:1617
+#: ../calendar/conduits/calendar/calendar-conduit.c:1612
+#: ../calendar/conduits/calendar/calendar-conduit.c:1615
 msgid "Could not read pilot's Calendar application block"
 msgstr "Неуспело читање програмског блока пилотовог Календара"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1026
-#: ../calendar/conduits/memo/memo-conduit.c:1029
+#: ../calendar/conduits/memo/memo-conduit.c:1024
+#: ../calendar/conduits/memo/memo-conduit.c:1027
 msgid "Could not read pilot's Memo application block"
 msgstr "Неуспело читање пилотовог блока белешки"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1073
-#: ../calendar/conduits/memo/memo-conduit.c:1076
+#: ../calendar/conduits/memo/memo-conduit.c:1071
+#: ../calendar/conduits/memo/memo-conduit.c:1074
 msgid "Could not write pilot's Memo application block"
 msgstr "Неуспео упис пилотовог блока белешки"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:237
 msgid "Default Priority:"
 msgstr "Подразумевана важност:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1192
-#: ../calendar/conduits/todo/todo-conduit.c:1195
+#: ../calendar/conduits/todo/todo-conduit.c:1190
+#: ../calendar/conduits/todo/todo-conduit.c:1193
 msgid "Could not read pilot's ToDo application block"
 msgstr "Неуспело читање пилотовог ToDo програмског блока"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1237
-#: ../calendar/conduits/todo/todo-conduit.c:1240
+#: ../calendar/conduits/todo/todo-conduit.c:1235
+#: ../calendar/conduits/todo/todo-conduit.c:1238
 msgid "Could not write pilot's ToDo application block"
 msgstr "Неуспео упис у пилотов блок „урадити“"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2219
 msgid "Calendar and Tasks"
 msgstr "Календар и задужења"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1380
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4627,22 +4599,24 @@ msgid "Memo_s"
 msgstr "Бе_лешке"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../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/memos-control.c:352
 msgid "Memos"
 msgstr "Белешке"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:483
+#: ../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/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:403
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:547
+#: ../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-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Задужења"
@@ -4670,11 +4644,10 @@ msgstr[2] "минута"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../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-weather/calendar-weather.c:564
+#: ../plugins/calendar-weather/calendar-weather.c:562
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "сат"
@@ -4692,10 +4665,10 @@ msgstr "Заказани састанци"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1570
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 #: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../plugins/itip-formatter/itip-view.c:998
 msgid "Location:"
 msgstr "Место:"
 
@@ -4705,16 +4678,16 @@ msgstr "Време _дремања:"
 
 #: ../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:160
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:163
 #: ../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
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Уређивање"
 
@@ -4726,32 +4699,32 @@ msgstr "Дре_мање"
 msgid "location of appointment"
 msgstr "заказано место састанка"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1429
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1552
 msgid "No summary available."
 msgstr "Нема доступног прегледа."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1438
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1440
 msgid "No description available."
 msgstr "Нема доступног описа."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
 msgid "No location information available."
 msgstr "Нема доступног податка о месту."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
 #, c-format
 msgid "You have %d alarms"
 msgstr "Број постављених аларма: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1654
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1658
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4763,7 +4736,7 @@ msgstr ""
 "подсетник подешен да пошаље поруку. Еволуција ће\n"
 "уместо тога приказати нормално прозорче."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4780,7 +4753,7 @@ msgstr ""
 "\n"
 "Сигурно желите да покренете овај програм?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1751
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
@@ -4828,165 +4801,165 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунде"
 msgstr[2] "%d секунди"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Програми за аларм"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Тражи потврду за брисање предмета"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Боја позадине задужења за данас, у облику „#rrggbb“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Боја позадине неиспуњених задужења, у облику „#rrggbb“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Календари за које се покреће аларм"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Боја за исцртавање Маркус Бејнс линије у линији времена (подразумевано је "
 "празно)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Боја за исцртавање Маркус Бејнс линије у дневном прегледу."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Сажми викенде у месечни преглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "Потврди пражњење"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Потребно је означити дане којима почињу и завршавају се радни часови."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "Подразумевани подсетник за састанак"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "Подразумеване јединице подсетника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "Подразумевана вредност подсетника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "Директоријум за чување звучних датотека аларма"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "Степен догађаја"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "Провидност догађаја"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "Адресе сервера за слободно/заузето време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "Модел адреса за слободно/заузето време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "Степен догађаја у прегледу календара."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Сакриј завршена задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Сакриј јединице задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Сакриј вредност задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Позиција положене површи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Сат којим се завршава радна недеља, у двадесетчетворочасовном облику, од 0 "
 "до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Сат којим почиње радна недеља, у двадесетчетворочасовном облику, од 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Интервали приказани у дневним и недељним прегледима, у минутима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "Последње време за аларм"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "Списак адреса сервера за објављивање слободног/заузетог времена."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Маркус Бејнс линија"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Боја Маркус Бејнс линије - дневни преглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Боја Маркус Бејнс линије - линија времена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Минут којим се завршава радни дан, од 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Минут којим почиње радни дан, од 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "Позиција положене површи месечног прегледа"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "Позиција усправне површи месечног прегледа"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "Број јединица за одређивање подразумеваног подсетника."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "Број јединица за одређивање када сакрити задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "Боја прекорачених задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4994,7 +4967,7 @@ msgstr ""
 "Позиција положене површи, између дела календара за датум и листе задужења "
 "када није постављен месечни преглед, у пикселима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5002,7 +4975,7 @@ msgstr ""
 "Позиција положене површи, између прегледа и дела календара за датум и листе "
 "задужења у месечном прегледу, у пикселима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5010,7 +4983,7 @@ msgstr ""
 "Положај усправне површи, између листе календара и навигације календара по "
 "датуму."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5018,7 +4991,7 @@ msgstr ""
 "Позиција усправне површи, између листе задужења и панела за преглед "
 "задужења, у пикселима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5026,7 +4999,7 @@ msgstr ""
 "Позиција усправне површи, између прегледа и дела календа за датум и листе "
 "задужења у месечном прегледу, у пикселима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5034,69 +5007,69 @@ msgstr ""
 "Позиција усправне површи, између прегледа и дела календара за датум и листе "
 "задужења када није постављен месечни преглед, у пикселима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Програми који могу бити покренути алармима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "Директоријум за чување звучних аларма"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Прикажи RSVP поље у уређивачу догађаја/задужења/сусрета"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Прикажи поље улоге у уређивачу догађаја/задужења/сусрета"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "Приказује времена завршетка састанака у недељним и месечним прегледима"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Прикажи поље категорије у уређивачу догађаја/сусрета/задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "Приказује аларме у обавештајној зони"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Прикажи поље „Стање“ у уређивачу догађаја/задужења/сусрета"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Show the \"Preview\" pane"
 msgstr "Прикажи површ „Преглед“"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Show the \"Preview\" pane."
 msgstr "Приказује површ „Преглед“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Прикажи поље временске зоне у уређивачу догађаја (сусрета)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Прикажи поље „Врста“ у уређивачу догађаја/задужења/сусрета"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "Приказује бројеве недеља у делу за датум"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "Боја задужења за данас"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "Позиција усправне површи задужења"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5105,7 +5078,7 @@ msgstr ""
 "Модел адресе за коришћење у повраћају времена слободно/заузето, %u се "
 "замењује корисничким делом електронске адресе, а %d доменом."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5113,20 +5086,20 @@ msgstr ""
 "Подразумевана временска зона коју календар користи за датум и време, као "
 "непреведено место базе временске зоне Олсен, као „Америка/Њујорк“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "Подела _времена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "Време последњег покретања аларма, у time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5134,41 +5107,41 @@ msgstr ""
 "Провидност докађаја у прегледу календара, вредност између 0 (провидно) и 1 "
 "(непровидно)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24-часовни облик времена"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Јединице за подразумевани подсетник, „минути“, „сати“ или „дани“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Јединице за одређивање када сакрити задужења, „минути“, „сати“, или „дани“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "Почетак недеље"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Дан којим почиње недеља, од недеље (0) до суботе (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Да ли да користи обавештајну зону за приказивање аларма."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Да ли да тражи потврду за брисање састанка или задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Да ли да тражи потврду при избацивању састанка и задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5176,117 +5149,151 @@ msgstr ""
 "Да ли да сажме викенде у месечном прегледу, који суботу и недељу ставља у "
 "простор радне недеље."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Да ли да прикаже времена завршетка догађаја у недељним и месечним прегледима."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Да ли да у календару исцрта Маркус Бејнс линију (на тренутно време)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Да ли да сакрије завршена задужења у прегледу задужења."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "Да ли да постави подразумевани подсетник за заказане састанке."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Да ли да прикаже RSVP поље у уређивачу догађаја/задужења/састанака"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Да ли да прикаже поље категорије у уређивачу догађаја (састанака)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Да ли да прикаже поље са улогом у уређивачу догађаја/задужења/сусрета."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Да ли да прикаже поље са стањем у уређивачу догађаја/задужења/сусрета."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Да ли да прикаже време у двадесеточасовном облику уместо am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Да ли да прикаже поље временске зоне у уређивачу догађаја (састанака)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Да ли да прикаже поље врсту у уређивачу догађаја/задужења/сусрета."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Да ли да прикаже бројеве недеља у делу за датум."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Дали да се користи летње рачунање времена када се приказују догађаји."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "Радни дани"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "Час којим се завршава радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "Минут којим се завршава радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "Час којим почиње радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "Минут којим почиње радни дан"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "Летње рачунање времена"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "Преглед садржи"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Category is"
 msgstr "Категорија је"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "Коментар садржи"
 
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Location contains"
 msgstr "Место садржи"
 
-#: ../calendar/gui/cal-search-bar.c:432
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "Не одговара"
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 days Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:635
+#, fuzzy
+msgid "Active Tasks"
+msgstr "_Додељено задужење"
+
+#: ../calendar/gui/cal-search-bar.c:639
+#, fuzzy
+msgid "Over Due Tasks"
+msgstr "_Неиспуњена задужења:"
+
+#: ../calendar/gui/cal-search-bar.c:643
+#, fuzzy
+msgid "Completed Tasks"
+msgstr "Завршено "
+
+#: ../calendar/gui/cal-search-bar.c:647
+#, fuzzy
+msgid "Tasks With Attachments"
+msgstr "Поруке са прилозима"
+
+#: ../calendar/gui/cal-search-bar.c:693
+#, fuzzy
+msgid "Active Appointments"
+msgstr "Заказани састанци"
+
+#: ../calendar/gui/cal-search-bar.c:697
+#, fuzzy
+msgid "Next 7 Day Appointments"
+msgstr "Цело_дневни састанак"
+
+#: ../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
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Штампај"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5295,15 +5302,14 @@ msgstr ""
 "Ова радња ће трајно обрисати све догађаје пре изабраног рока. Уколико "
 "наставите, нећете моћи да повратите ове догађаје."
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "Избаци догађаје старије од"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../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-weather/calendar-weather.c:563
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "дана"
@@ -5312,89 +5318,89 @@ msgstr "дана"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:265
+#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:223
 msgid "On The Web"
 msgstr "На вебу"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Рођендани и годишњице"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Време"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:588
 msgid "_New Calendar"
 msgstr "Нови _календар"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:918
 msgid "Failed upgrading calendars."
 msgstr "Неуспела допуна календара."
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1217
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Није могуће отворити календар ’%s‘ за прављење догађаја и састанака"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1233
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема доступног календара за прављење догађаја и састанака"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1355
 msgid "Calendar Source Selector"
 msgstr "Бирач извора календара"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1563
 msgid "New appointment"
 msgstr "Нови заказани састанак"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1564
 msgid "_Appointment"
 msgstr "_Заказани састанак"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1565
 msgid "Create a new appointment"
 msgstr "Заказује нови састанак"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1571
 msgid "New meeting"
 msgstr "Нови састанак"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1572
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1573
 msgid "Create a new meeting request"
 msgstr "Прави нови захтев за састанком"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1579
 msgid "New all day appointment"
 msgstr "Нови целодневни састанак"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1580
 msgid "All Day A_ppointment"
 msgstr "Цело_дневни састанак"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1581
 msgid "Create a new all-day appointment"
 msgstr "Прави нови целодневни састанак"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1587
 msgid "New calendar"
 msgstr "Нови календар"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1588
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1589
 msgid "Create a new calendar"
 msgstr "Прави нови календар"
 
@@ -5414,6 +5420,18 @@ msgstr "Недељни преглед"
 msgid "Month View"
 msgstr "Месечни преглед"
 
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy
+msgid "Description Contain"
+msgstr "Опис садржи"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+#, fuzzy
+msgid "Summary Contain"
+msgstr "Преглед садржи"
+
 #: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "Грешка при отварању календара"
@@ -5426,11 +5444,11 @@ msgstr "Метод није подржан при отварању календ�
 msgid "Permission denied to open the calendar"
 msgstr "Забрањен приступ календару"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1273
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1282
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
 msgstr "Навиј сат"
 
@@ -5478,67 +5496,72 @@ msgid "Run a program"
 msgstr "Покреће програм"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#, fuzzy
+msgid "Select A File"
+msgstr "Изаберите датотеку"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Пошаљи:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Шаље електронску поруку"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Аргументи:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Програм:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "По_нови аларм"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Звук:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "после"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "пре"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "дан(и)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "крај састанка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "покажи још на сваких"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "сат(и)"
 
 # bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "минут(и)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "почетак заказаног састанка"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr "Радња/покретач"
 
@@ -5555,7 +5578,6 @@ msgstr "Аларми"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../composer/e-msg-composer-select-file.c:98
 #: ../composer/e-msg-composer-select-file.c:118
 msgid "_Suggest automatic display of attachment"
@@ -5565,7 +5587,7 @@ msgstr "_Предложи аутоматски приказ прилога"
 msgid "Attach file(s)"
 msgstr "Прилаже датотеку(е)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
 msgid "Selected Calendars for Alarms"
 msgstr "Изабрани календари за које звони сат"
 
@@ -5591,7 +5613,7 @@ msgstr ""
 "<i>%u и %d ће бити замењени корисником и доменом из електронске адресе.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Упозорења</span>"
 
@@ -5671,8 +5693,7 @@ msgstr ""
 "Недеља"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid "Pick a color"
 msgstr "Бира боју"
 
@@ -5819,81 +5840,46 @@ msgstr "_Сре"
 msgid "before every appointment"
 msgstr "пре сваког састанка"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:268
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Умножава садржај календара локално за рад ван мреже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "_Умножава садржај листе задужења локално за рад ван мреже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_Умножава садржај списка белешки локално за рад ван мреже"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:342
 msgid "C_olor:"
 msgstr "_Боја:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 msgid "Task List"
 msgstr "Списак задужења"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:388
 msgid "Memo List"
 msgstr "Списак белешки"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:479
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Task List Properties"
 msgstr "Особине листе задужења"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:630
 msgid "New Memo List"
 msgstr "Нови списак белешки"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Додаје календар"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Додаје листу задужења"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Додај календар"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Додај листу задужења"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "О_свежи:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_Адреса :"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "недеље"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
@@ -5938,40 +5924,40 @@ msgstr "%s  Начинили сте промене. Занемарити их и
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Нисте начинили промене, освежити уређивач?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "Грешка провере: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2392
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
 msgid " to "
 msgstr " за "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2396
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2398
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
 msgid "Completed "
 msgstr "Завршено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2403
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
 msgid " (Due "
 msgstr " (До "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2405
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
 msgid "Due "
 msgstr "До "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2921
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2960
 #, c-format
 msgid "Attached message - %s"
 msgstr "Приложена порука - %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:2926
-#: ../composer/e-msg-composer.c:3122
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2965
+#: ../composer/e-msg-composer.c:3160
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5979,22 +5965,22 @@ msgstr[0] "%d приложена порука"
 msgstr[1] "%d приложене поруке"
 msgstr[2] "%d приложених порука"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3186
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1030 ../mail/message-list.c:1923
+#: ../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
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3188
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3226
+#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
 msgid "Cancel _Drag"
 msgstr "Откажи _превлачење"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:824
 msgid "Could not update object"
 msgstr "Није могуће освежити објекат"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2577
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6002,102 +5988,97 @@ msgstr[0] "<b>%d</b> прилог"
 msgstr[1] "<b>%d</b> прилога"
 msgstr[2] "<b>%d</b> прилога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1003
 msgid "Hide Attachment _Bar"
 msgstr "Сакриј линију при_лога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1530
+#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1542
 msgid "Show Attachment _Bar"
 msgstr "Прикажи линију п_рилога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/event-page.c:1898
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3693
+#: ../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
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3694 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../composer/e-msg-composer.c:3742 ../mail/em-folder-tree.c:2129
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
 msgid "_Properties"
 msgstr "О_собине"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3696
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../composer/e-msg-composer.c:3744
 msgid "_Add attachment..."
 msgstr "_Додај прилог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1554
-#: ../mail/em-format-html-display.c:2300
+#: ../calendar/gui/dialogs/comp-editor.c:1566
+#: ../mail/em-format-html-display.c:2318
 msgid "Show Attachments"
 msgstr "Прикажи п_рилоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1555
+#: ../calendar/gui/dialogs/comp-editor.c:1567
 msgid "Press space key to toggle attachment bar"
 msgstr "Притисните размак за приказ(сакривање) линије прилога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2162
-#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2173
+#: ../calendar/gui/dialogs/comp-editor.c:2216
 msgid "Edit Appointment"
 msgstr "Уреди заказани састанак"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2168
-#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../calendar/gui/dialogs/comp-editor.c:2179
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 #, c-format
 msgid "Meeting - %s"
 msgstr "Састанак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2181
+#: ../calendar/gui/dialogs/comp-editor.c:2224
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказани састанак - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2174
-#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2185
+#: ../calendar/gui/dialogs/comp-editor.c:2228
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Додељено задужење - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2187
+#: ../calendar/gui/dialogs/comp-editor.c:2230
 #, c-format
 msgid "Task - %s"
 msgstr "Задужење - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:2190
+#: ../calendar/gui/dialogs/comp-editor.c:2233
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Унос у дневник - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2243
 msgid "No summary"
 msgstr "Нема прегледа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2777
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:406
-#: ../mail/em-utils.c:438 ../widgets/misc/e-attachment-bar.c:350
+#: ../calendar/gui/dialogs/comp-editor.c:2789 ../mail/em-utils.c:370
+#: ../widgets/misc/e-attachment-bar.c:350
 msgid "attachment"
 msgstr "прилог"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
-#: ../calendar/gui/dialogs/comp-editor.c:2920
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2878
+#: ../calendar/gui/dialogs/comp-editor.c:2932
+#: ../calendar/gui/dialogs/comp-editor.c:2956
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промене начињене на овом предмету могу бити занемарене ако буде освежен"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2968
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "Није могуће коришћење текуће верзије!"
 
@@ -6178,21 +6159,21 @@ msgstr "Делегирај:"
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: ../calendar/gui/dialogs/event-editor.c:604
+#: ../calendar/gui/dialogs/event-editor.c:601
 msgid "Appoint_ment"
 msgstr "Зака_зани састанак"
 
-#: ../calendar/gui/dialogs/event-editor.c:608
+#: ../calendar/gui/dialogs/event-editor.c:605
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Учесталост"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2719
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.c:2734
 msgid "This event has alarms"
 msgstr "За овај догађај је навијен сат"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:895
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6200,68 +6181,68 @@ msgstr "За овај догађај је навијен сат"
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "_Delegatees"
 msgstr "Делегат_и"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:935
 msgid "Atte_ndees"
 msgstr "Уч_есници"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1100
 msgid "Event with no start date"
 msgstr "Догађај без датума почетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1103
 msgid "Event with no end date"
 msgstr "Догађај без датума завршетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
+#: ../calendar/gui/dialogs/event-page.c:1272
 #: ../calendar/gui/dialogs/memo-page.c:685
 #: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "Датум почетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1282
 msgid "End date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Start time is wrong"
 msgstr "Време почетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "End time is wrong"
 msgstr "Време завршетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1456
+#: ../calendar/gui/dialogs/event-page.c:1469
 #: ../calendar/gui/dialogs/memo-page.c:720
 #: ../calendar/gui/dialogs/task-page.c:906
 msgid "The organizer selected no longer has an account."
 msgstr "Изабрани организатор више нема налог."
 
-#: ../calendar/gui/dialogs/event-page.c:1462
+#: ../calendar/gui/dialogs/event-page.c:1475
 #: ../calendar/gui/dialogs/memo-page.c:726
 #: ../calendar/gui/dialogs/task-page.c:912
 msgid "An organizer is required."
 msgstr "Потребан је организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1477
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/task-page.c:927
 msgid "At least one attendee is required."
 msgstr "Најмање један учесник је потребан."
 
-#: ../calendar/gui/dialogs/event-page.c:1899
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1914
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Додај "
 
-#: ../calendar/gui/dialogs/event-page.c:2626
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Није могуће отварање календара ’%s‘."
 
-#: ../calendar/gui/dialogs/event-page.c:2932
+#: ../calendar/gui/dialogs/event-page.c:2947
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6269,7 +6250,7 @@ msgstr[0] "%d дан пре заказаног састанка"
 msgstr[1] "%d дана пре заказаног састанка"
 msgstr[2] "%d дана пре заказаног састанка"
 
-#: ../calendar/gui/dialogs/event-page.c:2938
+#: ../calendar/gui/dialogs/event-page.c:2953
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6277,7 +6258,7 @@ msgstr[0] "%d сат пре заказаног састанка"
 msgstr[1] "%d сата пре заказаног састанка"
 msgstr[2] "%d сати пре заказаног састанка"
 
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2959
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6285,7 +6266,7 @@ msgstr[0] "%d минут пре заказаног састанка"
 msgstr[1] "%d минута пре заказаног састанка"
 msgstr[2] "%d минута пре заказаног састанка"
 
-#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2972
 msgid "Customize"
 msgstr "Прилагоди"
 
@@ -6295,19 +6276,20 @@ msgstr "Прилагоди"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2962
+#: ../calendar/gui/dialogs/event-page.c:2977
 #: ../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:2318
-#: ../filter/filter-rule.c:890 ../mail/em-account-editor.c:701
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2361
+#: ../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
 #: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../plugins/itip-formatter/itip-formatter.c:1910
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1718
 msgid "None"
 msgstr "Ништа"
 
@@ -6337,7 +6319,6 @@ msgid "Custom Alarm:"
 msgstr "Прилагођен звук аларма:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Опис:"
 
@@ -6374,56 +6355,6 @@ msgstr "за"
 msgid "until"
 msgstr "до"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "_Учесник"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Кликните овде да додате учесника"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Заједничко име"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Делегирао"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Делегирано"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Језик"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Члан"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Статус"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>Учесни_ци</b>"
@@ -6445,18 +6376,18 @@ msgstr "Организатор"
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2452
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:868
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Није могуће отварање белешки у „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../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
 msgid "To"
 msgstr "Прима"
 
@@ -6479,42 +6410,6 @@ msgstr "_Опис:"
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Опције календара</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Додај нови календар"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Група календара"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Место календара"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Име календара"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>Опције листе задужења</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Додај нову листу задужења"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Група за листе задужења"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Име листе задужења"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Мењате повратни догађај, шта желите да измените?"
@@ -6533,19 +6428,19 @@ msgid ""
 "You are modifying a recurring journal entry. What would you like to modify?"
 msgstr "Мењате повратни унос у дневник, шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Само овај унос"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Овај и претходне уносе"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Овај и будуће уносе"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Све уносе"
 
@@ -6653,23 +6548,23 @@ msgstr "на"
 msgid "occurrences"
 msgstr "појаве"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2157
 msgid "Add exception"
 msgstr "Додај изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2200
 msgid "Could not get a selection to modify."
 msgstr "Не може да нађе избор ради мењања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2206
 msgid "Modify exception"
 msgstr "Измени изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2252
 msgid "Could not get a selection to delete."
 msgstr "Не може да нађе избор ради брисања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -6725,7 +6620,7 @@ msgstr "година(е)"
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
 msgid "Web Page"
 msgstr "Веб страна"
 
@@ -6741,48 +6636,48 @@ msgstr "<span weight=\"bold\">Статус</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:231
+#: ../calendar/gui/e-cal-component-preview.c:233
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-calendar-table.c:463 ../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:2513 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Завршено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1034
 msgid "High"
 msgstr "Висока"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-preview.c:230
 #: ../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:461 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2345
 msgid "In Progress"
 msgstr "У току"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1032
 msgid "Low"
 msgstr "Мала"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
 #: ../mail/message-list.c:1033
 msgid "Normal"
 msgstr "Обична"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
 msgid "Not Started"
 msgstr "Није започето"
 
@@ -6795,7 +6690,7 @@ msgid "Stat_us:"
 msgstr "_Стање:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "Undefined"
 msgstr "Неодређена"
 
@@ -6812,12 +6707,12 @@ msgstr "_Важност:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:424
+#: ../calendar/gui/tasks-component.c:1250
 msgid "_Task"
 msgstr "_Задужење"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:428
 msgid "Task Details"
 msgstr "Детаљи задужења"
 
@@ -6838,6 +6733,11 @@ msgstr "Уч_есници..."
 msgid "Categor_ies..."
 msgstr "Ка_тегорије..."
 
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "De_scription:"
+msgstr "Опис:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "Ор_ганизатор:"
@@ -6850,49 +6750,6 @@ msgstr "Временска зона:"
 msgid "_Due date:"
 msgstr "Датум _за завршетак:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>К_алендари за слободно/заузето</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Учесталост објављивања</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Место објављивања</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Подешавања објављивања слободно/заузето"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Дневно"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Ручно"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Лозинка:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "_Запамти лозинку"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "_Корисничко име:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "_Недељно"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6971,72 +6828,72 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2913
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3000
 #, c-format
 msgid "Click to open %s"
 msgstr "Притисните да отворите %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:157
+#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "Неименовано"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:206
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../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
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:219
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-memo-preview.c:221
+#: ../calendar/gui/e-cal-component-preview.c:271
 #: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:252
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:254
+#: ../calendar/gui/e-cal-component-preview.c:304
 msgid "Web Page:"
 msgstr "Веб страница:"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-cal-component-preview.c:190
 #: ../calendar/gui/e-itip-control.c:1135
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Преглед:"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:219
 msgid "Due Date:"
 msgstr "Датум за завршетак:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:226
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Status:"
 msgstr "Стање:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:250
 msgid "Priority:"
 msgstr "Важност:"
 
 #: ../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:365
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "Јавно"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "Лично"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "Поверљиво"
 
@@ -7057,12 +6914,12 @@ msgid "Summary"
 msgstr "Преглед"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:440
 msgid "Free"
 msgstr "Слободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:441
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Заузето"
@@ -7099,12 +6956,12 @@ msgstr "Не"
 #: ../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:1213
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../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
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -7116,27 +6973,27 @@ msgstr "Поновно"
 msgid "Assigned"
 msgstr "Додељено"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:422
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2146
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2163
 msgid "Select folder to save selected attachments..."
 msgstr "Изаберите фасциклу за чување изабраних прилога..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:447
 #, c-format
 msgid "untitled_image.%s"
 msgstr "неименована_слика.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1144 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../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
 msgid "_Save As..."
 msgstr "_Сачувај као..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:565
+#: ../mail/em-popup.c:576
 msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
@@ -7144,84 +7001,84 @@ msgstr "Постави као _позадину"
 msgid "_Save Selected"
 msgstr "_Сачувај изабрано"
 
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:786
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
 msgid "Deleting selected objects"
 msgstr "Брисање изабраних објеката"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:958
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
 msgid "Updating objects"
 msgstr "Освежавање објеката"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1351
+#: ../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
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Task"
 msgstr "Ново зад_ужење"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
 msgid "Open _Web Page"
 msgstr "Отвори _Веб страницу"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1145
+#: ../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
 #: ../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
@@ -7229,52 +7086,52 @@ msgstr "Отвори _Веб страницу"
 msgid "_Print..."
 msgstr "Штам_пај..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Исеци"
 
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../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
 #: ../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 "У_баци"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Додели задужење"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Проследи као иКалендар"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark as Complete"
 msgstr "_Обележи као завршено"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1297
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Обележи изабрана задужења као завршена"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1298
 msgid "_Mark as Incomplete"
 msgstr "_Обележи као незавршено"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1299
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Обележи изабрана задужења као незавршена"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1304
 msgid "_Delete Selected Tasks"
 msgstr "_Обриши изабрана задужења"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1537
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Кликните за ново задужење"
@@ -7284,7 +7141,7 @@ msgstr "Кликните за ново задужење"
 msgid "% Complete"
 msgstr "% Завршено"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:698
 msgid "Complete"
 msgstr "Завршено"
 
@@ -7305,105 +7162,112 @@ msgstr "Важност"
 msgid "Start date"
 msgstr "Датум почетка"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:16
+msgid "Status"
+msgstr "Статус"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Разврставање задужења"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Moving items"
 msgstr "Премештање предмета"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1350
 msgid "Copying items"
 msgstr "Умножавање предмета"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Appointment..."
 msgstr "Нови _састанак..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New _Meeting"
 msgstr "Нови _састанак"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "_Current View"
 msgstr "_Тренутни преглед"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1674
 msgid "Select T_oday"
 msgstr "Изабери _данашњи дан"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "_Select Date..."
 msgstr "_Изабери датум..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи у календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Delegate Meeting..."
 msgstr "_Делегирај састанак..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као иКалендар..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Reply"
 msgstr "О_дговори"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1139
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1147
+#: ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1704
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2165
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2169
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2481
+#: ../calendar/gui/e-calendar-view.c:2185 ../calendar/gui/print.c:2316
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2216
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7426,11 +7290,10 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 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:124
-#, c-format
+#: ../calendar/gui/e-cell-date-edit-text.c:127
+#, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Датум мора бити унет у облику: \n"
@@ -7460,19 +7323,19 @@ msgstr "%02i минутни размаци"
 #: ../calendar/gui/e-day-view-top-item.c:1311
 #: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1643
+#: ../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:952
+#: ../calendar/gui/e-week-view.c:503 ../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:954
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
 msgid "pm"
 msgstr "pm"
 
@@ -7604,12 +7467,12 @@ msgstr "иКалендар грешка"
 
 #: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
 #: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
 msgid "An unknown person"
 msgstr "Непозната особа"
 
@@ -7624,21 +7487,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:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/itip-utils.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:1923
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
 #: ../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:693 ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/itip-utils.c:808 ../calendar/gui/itip-utils.c:837
+#: ../plugins/itip-formatter/itip-formatter.c:1929
 msgid "Declined"
 msgstr "Одбијено"
 
@@ -7835,75 +7698,74 @@ msgstr "Прилог не садржи исправну поруку за кал
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема предмете календара који се могу прегледати"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1944
 msgid "Update complete\n"
 msgstr "Освежавање завршено\n"
 
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1977
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат није исправан и не може бити освежен\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:1994
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао присутан учесник.  Додати га у присутне?"
 
-#: ../calendar/gui/e-itip-control.c:1986
+#: ../calendar/gui/e-itip-control.c:2012
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стање учесника није освежено јер нема исправано стање!\n"
 
-#: ../calendar/gui/e-itip-control.c:2003
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status updated\n"
 msgstr "Освежен статус учесника\n"
 
-#: ../calendar/gui/e-itip-control.c:2006
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:1228
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стање учесника није освежено јер предмет више не постоји"
 
-#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
 msgid "Item sent!\n"
 msgstr "Предмет послат!\n"
 
-#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Предмет није могао бити послат!\n"
 
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2223
 msgid "Choose an action:"
 msgstr "Изаберите радњу:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Update"
 msgstr "Освежи"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2324
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Прихвати"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2325
 msgid "Tentatively accept"
 msgstr "Прихвати са резервом"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2326
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2355
 msgid "Send Free/Busy Information"
 msgstr "Пошаљи слободно/заузето податак"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2383
 msgid "Update respondent status"
 msgstr "Освежи статус саговорника"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2411
 msgid "Send Latest Information"
 msgstr "Пошаљи најновији податак"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:825
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Поништи"
@@ -8010,8 +7872,8 @@ msgstr "Са резервом"
 
 #: ../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:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/itip-utils.c:811
+#: ../plugins/itip-formatter/itip-formatter.c:1932
 msgid "Delegated"
 msgstr "Делегирано"
 
@@ -8020,6 +7882,12 @@ msgstr "Делегирано"
 msgid "Attendee                          "
 msgstr "Учесник"
 
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "У току"
@@ -8028,7 +7896,7 @@ msgstr "У току"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel.c:2116
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -8042,7 +7910,7 @@ msgstr "%A, %d %B , %Y."
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel.c:2149
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y."
 
@@ -8057,7 +7925,7 @@ msgstr "%a %d/%m/%Y."
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Out of Office"
 msgstr "Ван канцеларије"
 
@@ -8065,67 +7933,95 @@ msgstr "Ван канцеларије"
 msgid "No Information"
 msgstr "Нема податка"
 
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "A_ttendees..."
 msgstr "Уч_есници..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:449
 msgid "O_ptions"
 msgstr "О_пције"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:466
 msgid "Show _only working hours"
 msgstr "Прикажи _само радне сате"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "Show _zoomed out"
 msgstr "Прикажи _умањено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_Update free/busy"
 msgstr "_Освежи слободно/заузето"
 
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:506
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid "_Autopick"
 msgstr "_Самоизбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:556
 msgid "_All people and resources"
 msgstr "_Све људе и изворе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "All _people and one resource"
 msgstr "Све _људе и један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:583
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:646
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "_Учесник"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Кликните овде да додате учесника"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Заједничко име"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Делегирао"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Делегирано"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Језик"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Члан"
+
+#: ../calendar/gui/e-memo-table.c:920
 msgid "_Delete Selected Memos"
 msgstr "_Обриши изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Притисните да додате белешку"
 
@@ -8133,8 +8029,8 @@ msgstr "Притисните да додате белешку"
 msgid "Memo sort"
 msgstr "Разврставање белешки"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2771
+#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
+#: ../calendar/gui/gnome-cal.c:2828
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8143,38 +8039,33 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:781
 msgid "Loading memos"
 msgstr "Учитавање белешки је у току"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:862
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Отварање белешки са %s је у току"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1035 ../calendar/gui/e-tasks.c:1249
 msgid "Deleting selected objects..."
 msgstr "Брисање изабраних објеката..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Унесите лозинку за %s"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:894
 msgid "Loading tasks"
 msgstr "Учитавање задужења"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:981
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварање задужења у %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1226
 msgid "Completing tasks..."
 msgstr "Завршавање задужења..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1276
 msgid "Expunging"
 msgstr "Избацивање"
 
@@ -8188,47 +8079,47 @@ msgstr "Изаберите временску зону"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1624
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:824
 msgid "Updating query"
 msgstr "Освежавање упита"
 
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2479
 msgid "_Custom View"
 msgstr "Пр_илагођен преглед"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2480
 msgid "_Save Custom View"
 msgstr "Сачувај прилагођен прег_лед"
 
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2485
 msgid "_Define Views..."
 msgstr "Одре_ди прегледе..."
 
-#: ../calendar/gui/gnome-cal.c:2600
+#: ../calendar/gui/gnome-cal.c:2651
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Учитавање састанака са %s"
 
-#: ../calendar/gui/gnome-cal.c:2619
+#: ../calendar/gui/gnome-cal.c:2670
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Учитавање задужења са %s"
 
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2679
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Учитавање белешки на %s"
 
-#: ../calendar/gui/gnome-cal.c:2736
+#: ../calendar/gui/gnome-cal.c:2787
 #, c-format
 msgid "Opening %s"
 msgstr "Отварање %s"
 
-#: ../calendar/gui/gnome-cal.c:3664
+#: ../calendar/gui/gnome-cal.c:3726
 msgid "Purging"
 msgstr "Брисање"
 
@@ -8288,65 +8179,65 @@ msgstr "Септембар"
 msgid "_Select Today"
 msgstr "_Изабери данашњи дан"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:523 ../calendar/gui/itip-utils.c:572
+#: ../calendar/gui/itip-utils.c:678
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:559
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:887
 msgid "Event information"
 msgstr "Податак о догађају"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:766 ../calendar/gui/itip-utils.c:889
 msgid "Task information"
 msgstr "Податак о задужењу"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:768 ../calendar/gui/itip-utils.c:891
 msgid "Journal information"
 msgstr "Податак о дневнику"
 
-#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:909
 msgid "Free/Busy information"
 msgstr "Слободно/заузето податак"
 
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:772
 msgid "Calendar information"
 msgstr "Податак о календару"
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:821
 msgid "Updated"
 msgstr "Освежено"
 
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:829
 msgid "Refresh"
 msgstr "Освежи"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:833
 msgid "Counter-proposal"
 msgstr "Против-предлог"
 
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:905
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободно/заузето време (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:915
 msgid "iCalendar information"
 msgstr "иКалендар податак"
 
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:1082
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:456
 msgid "_New Memo List"
 msgstr "_Нови списак белешки"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:532
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8354,8 +8245,7 @@ msgstr[0] "%d белешка"
 msgstr[1] "%d белешке"
 msgstr[2] "%d белешки"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
-#: ../mail/mail-component.c:562
+#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8363,61 +8253,61 @@ msgstr[0] ", %d изабрано"
 msgstr[1] "%d изабрана"
 msgstr[2] "%d изабраних"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:581
 msgid "Failed upgrading memos."
 msgstr "Неуспела допуна белешки."
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:879
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Није могуће отварање списка белешки „%s“ за прављење догађаја и састанака"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:892
 msgid "There is no calendar available for creating memos"
 msgstr "Ниједан календар није доступан за прављење белешки"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:988
 msgid "Memo Source Selector"
 msgstr "Бирач извора белешки"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1171
 msgid "New memo"
 msgstr "Нова белешка"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1172
 msgid "Mem_o"
 msgstr "_Белешка"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1173
 msgid "Create a new memo"
 msgstr "Напиши једну нову белешку"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1179
 msgid "New shared memo"
 msgstr "Нова дељена белешка"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1180
 msgid "_Shared memo"
 msgstr "_Дељена белешка"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1181
 msgid "Create a shared new memo"
 msgstr "Направи нобу дељену белешку"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1187
 msgid "New memo list"
 msgstr "Нови списак белешки"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1188
 msgid "Memo li_st"
 msgstr "Спи_сак белешки"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1189
 msgid "Create a new memo list"
 msgstr "Састави нови списак белешки"
 
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
 msgid "Print Memos"
 msgstr "Штампај белешке"
 
@@ -8446,266 +8336,235 @@ msgstr ""
 "Будите стрпљиви док Еволуција преноси фасцикле..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Није могућ пренос старих подешавања из evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:809
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Није могућ пренос календара ’%s‘"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Није могућ пренос задужења ’%s‘"
 
-#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:404
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:435
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:548
+#: ../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
 msgid "Notes"
 msgstr "Напомене"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:519
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:594
 msgid "Su"
 msgstr "Не"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
 msgid "Mo"
 msgstr "По"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
 msgid "Tu"
 msgstr "Ут"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
 msgid "Th"
 msgstr "Че"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
 msgid "Fr"
 msgstr "Пе"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
 msgid "Sa"
 msgstr "Су"
 
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Изабрани дан (%a, %d. %b %Y.)"
-
-#: ../calendar/gui/print.c:2072 ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%a, %d. %b"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%a, %d. %Y."
-
-#: ../calendar/gui/print.c:2077 ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%a, %d. %b %Y."
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Изабрана недеља (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "Изабрани месец (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "Изабрана година (%Y)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2283
 msgid "Appointment"
 msgstr "Заказани састанак"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2285
 msgid "Task"
 msgstr "Задужење"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2307
 #, c-format
 msgid "Summary: %s"
 msgstr "Преглед: %s"
 
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2358
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2375
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2387
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Постотак завршеног: %i"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2399
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Контакти: "
 
-#: ../calendar/gui/print.c:2654 ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "Штампај предмет"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2524
+#, fuzzy
+msgid "Upcoming Appointments"
+msgstr "_Отвори састанак"
 
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:447
 msgid "_New Task List"
 msgstr "Но_ви списак задужења"
 
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:523
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8713,57 +8572,57 @@ msgstr[0] "%d задужење"
 msgstr[1] "%d задужења"
 msgstr[2] "%d задужења"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:572
 msgid "Failed upgrading tasks."
 msgstr "Неуспела допуна задужења."
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:883
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Није могуће отварање листе задужења ’%s‘ за прављење догађаја и састанака"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:896
 msgid "There is no calendar available for creating tasks"
 msgstr "Ниједан календар није доступан за прављење задужења"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:993
 msgid "Task Source Selector"
 msgstr "Бирач извора задужења"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1249
 msgid "New task"
 msgstr "Ново задужење"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1251
 msgid "Create a new task"
 msgstr "Направи ново задужење"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1257
 msgid "New assigned task"
 msgstr "Ново додељено задужење"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1258
 msgid "Assigne_d Task"
 msgstr "_Додељено задужење"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1259
 msgid "Create a new assigned task"
 msgstr "Додели ново задужење"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1265
 msgid "New task list"
 msgstr "Нова листа задужења"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Tas_k list"
 msgstr "_Листа задужења"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1267
 msgid "Create a new task list"
 msgstr "Састави нову листу задужења"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8775,11 +8634,11 @@ msgstr ""
 "\n"
 "Заиста обрисати ова задужења?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Не питај ме поново."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
 msgid "Print Tasks"
 msgstr "Штампај задужења"
 
@@ -10357,58 +10216,6 @@ msgstr "Пацифик/Волис"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "Линија прилога"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Није могуће прилагање датотеке %s: %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Није могуће прилагање датотеке %s: није регуларна датотека"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Особине прилога"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Име датотеке:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME тип:"
-
 #: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "Одредишна пошта"
@@ -10417,7 +10224,7 @@ msgstr "Одредишна пошта"
 msgid "Choose folders to post the message to."
 msgstr "Изаберите фасцикле за слање поруке."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:602
 msgid "Click here for the address book"
 msgstr "Кликните овде за именик."
 
@@ -10432,45 +10239,45 @@ msgstr "Кликните овде за именик."
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:634
 msgid "_Reply-To:"
 msgstr "_Одговор:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:641
 msgid "Fr_om:"
 msgstr "Ш_аље:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:648
 msgid "S_ubject:"
 msgstr "На_слов:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:657
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:661
 msgid "_Cc:"
 msgstr "_Копија (Cc):"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:662
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Унесите адресе које ће примити копију (cc) поруке"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:665
 msgid "_Bcc:"
 msgstr "_Невидљива копија (Bcc):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:666
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10481,15 +10288,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:673
 msgid "_Post To:"
 msgstr "С_лање на:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:678
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:683
 msgid "Post To:"
 msgstr "Слање на:"
 
@@ -10501,14 +10308,14 @@ msgstr "При_ложи"
 msgid "Insert Attachment"
 msgstr "Уметни прилог"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:834
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављен сертификат за "
 "потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:841
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10516,52 +10323,52 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављен сертификат за "
 "шифровање за овај налог"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1344 ../composer/e-msg-composer.c:2606
 msgid "Hide _Attachment Bar"
 msgstr "Сакриј ли_нију прилога"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3939
+#: ../composer/e-msg-composer.c:1347 ../composer/e-msg-composer.c:2609
+#: ../composer/e-msg-composer.c:3987
 msgid "Show _Attachment Bar"
 msgstr "Прикажи лини_ју прилога"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1379 ../composer/e-msg-composer.c:1413
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Непознат разлог"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1451
 msgid "Could not open file"
 msgstr "Није могуће отварање датотеке"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1459
 msgid "Unable to retrieve message from editor"
 msgstr "Није могуће вратити поруку из уређивача"
 
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1744
 msgid "Untitled Message"
 msgstr "Неименована порука"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1779
 msgid "Open File"
 msgstr "Отвара датотеку"
 
-#: ../composer/e-msg-composer.c:2198 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2241 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Аутоматски састављено"
 
-#: ../composer/e-msg-composer.c:2301
+#: ../composer/e-msg-composer.c:2344
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3821
-#: ../composer/e-msg-composer.c:3824
+#: ../composer/e-msg-composer.c:2620 ../composer/e-msg-composer.c:3869
+#: ../composer/e-msg-composer.c:3872
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:5048
+#: ../composer/e-msg-composer.c:5097
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10724,14 +10531,14 @@ msgstr "Сач_увај поруку"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
+#: ../shell/main.c:510
 msgid "Evolution"
 msgstr "Еволуција"
 
 # bug(slobo): tooltip би могао да буде и „Пошаљите е-поруку пријатељима и поред
 # овако уштогљених оригинала
 # msgstr "Пакет пословних програма"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:574
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:593
 msgid "Groupware Suite"
 msgstr "Пoшаљите електронску пошту пријатељима и пословним сарадницима"
 
@@ -10747,112 +10554,6 @@ msgstr "карта именика"
 msgid "calendar information"
 msgstr "податак календара"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Тренутно, Ваш статус је „Нисам у канцеларији“. </b>\n"
-"\n"
-"Желите ли да промените статус у „У канцеларији“? "
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Порука када нисте у канцеларији:</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Статус:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Доле изабрана порука ће бити аутоматски послата свакој особи која Вам "
-"пошаље\n"
-"пошту док нисте у канцеларији.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Тренутно сам у канцеларији"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Тренутно нисам у канцеларији"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "Не, не мењај стање"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Помоћник није у кацеларији"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Да, промени статус"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Примање поште</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Слање поште:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>Ова страна дозвољава да изаберете да ли желите да пошаљете признаницу "
-"уз своју\n"
-"поруку ради обавештења када буде прочитана, и да одредите шта Еволуција да "
-"ради када неко Вама пошаље признаницу.</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "Увек врати признаницу"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Питај ме желим ли да вратим признаницу"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "Никада не враћај признаницу"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "Признанице"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "Затражи повраћај признанице за све поруке које пошаљем"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "Осим ако је порука послата дописној листи, а не мени лично"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "Када примите поруку са признаницом, шта Еволуција да ради?"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Грешка Еволуције"
@@ -10876,6 +10577,19 @@ msgstr "Упит Еволуције"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Унутрашња грешка, захтевана је непозната грешка „%s“"
 
+#: ../e-util/e-print.c:136
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:143
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:149
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "Није могуће отварање датотеке &quot;{0}&quot;."
@@ -10896,15 +10610,11 @@ msgstr "Датотека постоји &quot;{0}&quot;."
 msgid "Overwrite file?"
 msgstr "Преписати датотеку?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
 msgid "_Overwrite"
 msgstr "_Препиши"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "Положај зоне."
-
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10912,7 +10622,15 @@ msgstr[0] "пре %d секунде"
 msgstr[1] "пре %d секунде"
 msgstr[2] "пре %d секунди"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10920,7 +10638,15 @@ msgstr[0] "пре %d минут"
 msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10928,7 +10654,15 @@ msgstr[0] "пре %d сат"
 msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10936,7 +10670,15 @@ msgstr[0] "пре %d дан"
 msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, fuzzy, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "У канцеларији сам"
+msgstr[1] "У канцеларији сам"
+msgstr[2] "У канцеларији сам"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10944,7 +10686,15 @@ msgstr[0] "пре %d недељу"
 msgstr[1] "пре %d недеље"
 msgstr[2] "пре %d недеља"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10952,7 +10702,15 @@ msgstr[0] "пре %d месец"
 msgstr[1] "пре %d месеца"
 msgstr[2] "пре %d месеци"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, fuzzy, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "У канцеларији сам"
+msgstr[1] "У канцеларији сам"
+msgstr[2] "У канцеларији сам"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10960,20 +10718,29 @@ msgstr[0] "пре %d годину"
 msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, fuzzy, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "У канцеларији сам"
+msgstr[1] "У канцеларији сам"
+msgstr[2] "У канцеларији сам"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<кликните овде да изаберете датум>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "сада"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:449
 msgid "Select a time to compare against"
 msgstr "Изаберите време за поређење"
 
@@ -10981,20 +10748,20 @@ msgstr "Изаберите време за поређење"
 msgid "Choose a file"
 msgstr "Изаберите датотеку"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:147
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:149
 msgid "To Do"
 msgstr "За урадити"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
+#: ../mail/mail-config.glade.h:98
 msgid "Later"
 msgstr "Касније"
 
@@ -11002,52 +10769,53 @@ msgstr "Касније"
 msgid "Test"
 msgstr "Проба"
 
-#: ../filter/filter-rule.c:799
+#: ../filter/filter-rule.c:800
 msgid "_Search name:"
 msgstr "Основа за _претрагу:"
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "Пронађи ставке које задовољавају следеће услове"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:867
 msgid "If all criteria are met"
 msgstr "ако су сви услови задовољени"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:867
 msgid "If any criteria are met"
 msgstr "ако је било који услов задовољен"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:869
 msgid "_Find items:"
 msgstr "_Пронађи предмете:"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "No reply or parent"
 msgstr "Нема одговора или родитеља"
 
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
+#: ../filter/filter-rule.c:893
+#, fuzzy
+msgid "I_nclude threads"
 msgstr "Укључи нити"
 
-#: ../filter/filter-rule.c:987 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:989 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:307
 msgid "Incoming"
 msgstr "Долазно"
 
-#: ../filter/filter-rule.c:987 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:989 ../mail/em-utils.c:308
 msgid "Outgoing"
 msgstr "Одлазно"
 
@@ -11072,7 +10840,7 @@ msgid "Missing file name."
 msgstr "Недостаје име датотеке."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Недостаје име."
 
@@ -11141,36 +10909,45 @@ msgstr "време у односу на тренутно време"
 msgid "ago"
 msgstr "пре"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "месеци"
 
 # bug: plural-forms
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:181
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:186
 msgid "seconds"
 msgstr "секунде"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "тренутно време"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "време које одредите"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "weeks"
+msgstr "недеље"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "године"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "Додај правило"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "Уреди правило"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "Име правила"
 
@@ -11216,11 +10993,10 @@ msgid "Evolution Mail preferences control"
 msgstr "Контрола поставки Еволуција поште"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:580
-#: ../mail/mail-component.c:581 ../mail/mail-component.c:722
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:529
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Пошта"
@@ -11231,7 +11007,7 @@ msgid "Mail Accounts"
 msgstr "Поштански налози"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
@@ -11258,7 +11034,7 @@ msgstr ""
 "и означите кућицу да би га прихватили\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:510
 msgid "Select Folder"
 msgstr "Изаберите фасциклу"
 
@@ -11270,7 +11046,7 @@ msgstr "Питај за сваку поруку"
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "Примање поште"
 
@@ -11278,7 +11054,7 @@ msgstr "Примање поште"
 msgid "Automatically check for _new mail every"
 msgstr "_Аутоматски провери за _нову пошту сваких"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:133
 msgid "Sending Email"
 msgstr "Слање поште"
 
@@ -11287,7 +11063,7 @@ msgid "Defaults"
 msgstr "Подразумевано"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:127
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Сигурност"
@@ -11305,19 +11081,21 @@ msgstr "Провера за нове поруке"
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Помоћник Еволуција налога"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
-msgid "Disable"
+#, fuzzy
+msgid "Di_sable"
 msgstr "Онемогући"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "Омогући"
+#: ../mail/em-account-prefs.c:411 ../mail/mail-config.glade.h:75
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "О_могући"
 
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:466
@@ -11325,9 +11103,8 @@ msgid "[Default]"
 msgstr "[Подразумевано]"
 
 # has "activatable" set.
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../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
 msgid "Enabled"
 msgstr "Омогућено"
@@ -11340,28 +11117,28 @@ msgstr "Име налога"
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:1033
+#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
+#: ../mail/mail-config.c:1029
 msgid "Unnamed"
 msgstr "Без имена"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:955
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:998
 msgid "Add signature script"
 msgstr "Додај скрипту за потпис"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1018
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:396
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1692
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
@@ -11370,7 +11147,7 @@ msgstr "непознати пошиљалац"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1739
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11378,6 +11155,11 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
+#: ../mail/em-composer-utils.c:1880
+#, fuzzy
+msgid "-----Original Message-----"
+msgstr "-------- Прослеђена порука --------"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "Пр_авила филтера"
@@ -11515,7 +11297,7 @@ msgstr "није"
 msgid "is not Flagged"
 msgstr "није означено"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:95
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ђубре"
@@ -11632,9 +11414,9 @@ msgstr "почиње са"
 msgid "Stop Processing"
 msgstr "Прекини обраду"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1661
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../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-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:6
 #: ../smime/lib/e-cert.c:1132
@@ -11650,75 +11432,75 @@ msgstr "Непостављен статус"
 msgid "<b>Then</b>"
 msgstr "<b>Онда</b>"
 
-#: ../mail/em-folder-browser.c:168
+#: ../mail/em-folder-browser.c:170
 msgid "C_reate Search Folder From Search..."
 msgstr "Направи Фасциклу претраге из претраге..."
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "All Messages"
 msgstr "Све поруке"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:193
 msgid "Unread Messages"
 msgstr "Непрочитаних порука:"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:195
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../mail/em-folder-browser.c:200
+#: ../mail/em-folder-browser.c:202
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:203
 msgid "Recent Messages"
 msgstr "Скорашње поруке"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:204
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:205
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:206
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:207
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../mail/em-folder-browser.c:1028
+#: ../mail/em-folder-browser.c:1025
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../mail/em-folder-browser.c:1072
+#: ../mail/em-folder-browser.c:1069
 msgid "All Account Search"
 msgstr "Претрага свих налога"
 
+# bug: no need for plural-forms
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Непрочитаних порука:"
+msgstr[1] "Непрочитаних порука:"
+msgstr[2] "Непрочитаних порука:"
+
 # bug: no need for plural-forms here, since text is in front of number
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Укупно порука:"
 msgstr[1] "Укупно порука:"
 msgstr[2] "Укупно порука:"
 
-# bug: no need for plural-forms
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "Непрочитаних порука:"
-msgstr[1] "Непрочитаних порука:"
-msgstr[2] "Непрочитаних порука:"
-
-#: ../mail/em-folder-properties.c:316
+#: ../mail/em-folder-properties.c:323
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "Folder Properties"
 msgstr "Особине фасцикле"
@@ -11750,8 +11532,9 @@ msgid "Drafts"
 msgstr "Припрема"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2462
+#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Сандуче"
 
@@ -11782,82 +11565,92 @@ msgstr "Учитавање..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:369
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:721
 msgid "Mail Folder Tree"
 msgstr "Стабло фасцикле за пошту"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:881
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештање фасцикле %s"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:883
 #, c-format
 msgid "Copying folder %s"
 msgstr "Умножавање фасцикле %s"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:890 ../mail/message-list.c:1867
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештање порука у фасциклу %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:892 ../mail/message-list.c:1869
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавање порука у фасциклу %s"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:908
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Није могуће убацити поруку(е) у оставу на највишем нивоу"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Умножи у фасциклу"
 
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1005 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Премести у фасциклу"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претрага фасцикли у „%s“"
 
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2110 ../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:58 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2111
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
-#: ../mail/em-folder-tree.c:2070
+#: ../mail/em-folder-tree.c:2115
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../mail/em-folder-tree.c:2071
+#: ../mail/em-folder-tree.c:2116
 msgid "_Move..."
 msgstr "_Премести..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2120
 msgid "_New Folder..."
 msgstr "_Нова фасцикла..."
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2124
+#, fuzzy
+msgid "Re_fresh"
+msgstr "Освежи"
+
+#: ../mail/em-folder-tree.c:2125
+#, fuzzy
+msgid "Fl_ush Outbox"
+msgstr "За слање"
+
+#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:136
 msgid "_Empty Trash"
 msgstr "Испразни _смеће"
 
@@ -11866,14 +11659,13 @@ msgstr "Испразни _смеће"
 msgid "Copying `%s' to `%s'"
 msgstr "Умножавање ’%s‘ у ’%s‘"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1030
-#: ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1038
+#: ../mail/em-folder-view.c:1053
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Изаберите фасциклу"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1053
 msgid "C_opy"
 msgstr "_Умножи"
 
@@ -11895,68 +11687,69 @@ msgstr "Направи фасциклу"
 msgid "Specify where to create the folder:"
 msgstr "Наведите где направити фасциклу:"
 
-#: ../mail/em-folder-view.c:966 ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:974 ../mail/mail.error.xml.h:68
 msgid "Mail Deletion Failed"
 msgstr "Неуспешно брисање поште"
 
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:975 ../mail/mail.error.xml.h:123
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Немате довољна овлашћења да обришете ову пошту."
 
-#: ../mail/em-folder-view.c:1138 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1146 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/em-folder-view.c:1140 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1148 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: ../mail/em-folder-view.c:1143 ../ui/evolution-mail-message.xml.h:107
+#. 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
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1158
 msgid "U_ndelete"
 msgstr "Пониш_ти брисање"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1159
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1160
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1163
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1164
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1165
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1166
 msgid "Mark as Un_important"
 msgstr "_Означи као неважно"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1167
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1168
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1169
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1171
 msgid "_Label"
 msgstr "Нат_пис"
 
@@ -11967,87 +11760,95 @@ msgstr "Нат_пис"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1163 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1172 ../widgets/misc/e-dateedit.c:473
 msgid "_None"
 msgstr "Ништ_а"
 
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1177
 msgid "Fla_g Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1178
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1181
 msgid "Crea_te Rule From Message"
 msgstr "На_прави правило од поруке"
 
-#: ../mail/em-folder-view.c:1173
+#: ../mail/em-folder-view.c:1182
 msgid "Search Folder from _Subject"
 msgstr "Фасцикла претраге на _наслов"
 
-#: ../mail/em-folder-view.c:1174
+#: ../mail/em-folder-view.c:1183
 msgid "Search Folder from Se_nder"
 msgstr "Фасцикла претраге на п_ошиљаоца"
 
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1184
 msgid "Search Folder from _Recipients"
 msgstr "Фасцикла претраге на _примаоце"
 
-#: ../mail/em-folder-view.c:1176
+#: ../mail/em-folder-view.c:1185
 msgid "Search Folder from Mailing _List"
 msgstr "Фасцикла претраге на дописну _листу"
 
-#: ../mail/em-folder-view.c:1180
+#: ../mail/em-folder-view.c:1189
 msgid "Filter on Sub_ject"
 msgstr "Филтер на насло_в"
 
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1190
 msgid "Filter on Sen_der"
 msgstr "Филтер на п_ошиљаоца"
 
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1191
 msgid "Filter on Re_cipients"
 msgstr "Филтер на п_римаоце"
 
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1192
 msgid "Filter on _Mailing List"
 msgstr "Филтер на _дописну листу"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2036 ../mail/em-folder-view.c:2080
+#: ../mail/em-folder-view.c:2099 ../mail/em-folder-view.c:2143
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../mail/em-folder-view.c:2185 ../mail/em-folder-view.c:2190
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "Штампај поруку"
-
-#: ../mail/em-folder-view.c:2349
+#: ../mail/em-folder-view.c:2356
 msgid "Unable to retrieve message"
 msgstr "Није могуће добити поруку"
 
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2377
+#, fuzzy
+msgid "<b>Retrieving Message...</b>"
+msgstr "Довлачење поруке %s"
+
+#: ../mail/em-folder-view.c:2601
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2604
 msgid "Create _Search Folder"
 msgstr "Направи Фасциклу _претраге"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2605
 msgid "_From this Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2606
 msgid "_To this Address"
 msgstr "_на ову адресу"
 
-#: ../mail/em-folder-view.c:2906
+#: ../mail/em-folder-view.c:2981
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
 
-#: ../mail/em-folder-view.c:2911
+#: ../mail/em-folder-view.c:2993
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Кликните да пошаљете %s"
+
+#: ../mail/em-folder-view.c:2998
 msgid "Click to hide/unhide addresses"
 msgstr "Притисни да сакријеш/откирјеш адресу"
 
@@ -12075,7 +11876,7 @@ msgstr "_Следеће"
 msgid "M_atch case"
 msgstr "_Подударај велико/мало слово"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:632
 msgid "Unsigned"
 msgstr "Непотписано"
 
@@ -12085,7 +11886,7 @@ msgid ""
 "authentic."
 msgstr "Ова порука није потписана. Није сигурно да је ова порука аутентична."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:633
 msgid "Valid signature"
 msgstr "Исправан потпис"
 
@@ -12097,7 +11898,7 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно аутентичан."
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:621
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:634
 msgid "Invalid signature"
 msgstr "Неисправан потпис"
 
@@ -12120,7 +11921,7 @@ msgstr ""
 "Ова порука је потписана исправним потписом, али пошиљалац поруке не може "
 "бити проверен."
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:641
 msgid "Unencrypted"
 msgstr "Нешифровано"
 
@@ -12132,7 +11933,7 @@ msgstr ""
 "Ова порука није шифрована.  Њен садржај је могуће видети у преносу преко "
 "Интернета."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:642
 msgid "Encrypted, weak"
 msgstr "Шифровано, слабо"
 
@@ -12145,7 +11946,7 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом.  Тешко је, али не и немогуће "
 "да неко са стране у догледно време види садржај ове поруке."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:643
 msgid "Encrypted"
 msgstr "Шифровано"
 
@@ -12156,7 +11957,7 @@ msgid ""
 msgstr ""
 "Ова порука је шифрована.  Тешко ће неко са стране видети садржај ове поруке."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:631
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:644
 msgid "Encrypted, strong"
 msgstr "Шифровано, јако"
 
@@ -12205,21 +12006,27 @@ msgstr "_Прилагоди на ширину"
 msgid "Show _Original Size"
 msgstr "Прикажи _оригиналну величину"
 
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2505
+#: ../mail/em-format-html-display.c:1903 ../mail/em-format-html-display.c:2514
 #: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прилог"
 
-#: ../mail/em-format-html-display.c:2107
-msgid "Select folder to save all attachments..."
+#: ../mail/em-format-html-display.c:2117
+#, fuzzy
+msgid "Save attachment as"
+msgstr "Сачувај прилоге"
+
+#: ../mail/em-format-html-display.c:2121
+#, fuzzy
+msgid "Select folder to save all attachments"
 msgstr "Изаберите фасциклу за чување свих прилога..."
 
-#: ../mail/em-format-html-display.c:2154
+#: ../mail/em-format-html-display.c:2172
 msgid "_Save Selected..."
 msgstr "Изабрано чување..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2221
+#: ../mail/em-format-html-display.c:2239
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12227,31 +12034,31 @@ msgstr[0] "%d при_лог"
 msgstr[1] "%d при_лога"
 msgstr[2] "%d при_логa"
 
-#: ../mail/em-format-html-display.c:2228 ../mail/em-format-html-display.c:2306
+#: ../mail/em-format-html-display.c:2246 ../mail/em-format-html-display.c:2324
 msgid "S_ave"
 msgstr "_Сачувај"
 
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2257
 msgid "S_ave All"
 msgstr "Сач_увај све"
 
-#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2320
 msgid "No Attachment"
 msgstr "Нема прилога"
 
-#: ../mail/em-format-html-display.c:2433 ../mail/em-format-html-display.c:2478
+#: ../mail/em-format-html-display.c:2451 ../mail/em-format-html-display.c:2487
 msgid "View _Unformatted"
 msgstr "Прегледај _неформатирано"
 
-#: ../mail/em-format-html-display.c:2435
+#: ../mail/em-format-html-display.c:2453
 msgid "Hide _Unformatted"
 msgstr "Сакриј _неформатирано"
 
-#: ../mail/em-format-html-display.c:2497
+#: ../mail/em-format-html-display.c:2506
 msgid "O_pen With"
 msgstr "О_твори помоћу"
 
-#: ../mail/em-format-html-display.c:2566
+#: ../mail/em-format-html-display.c:2577
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -12259,149 +12066,189 @@ msgstr ""
 "Еволуција не може да исцрта ово писмо пошто је превелико. Можете га "
 "погледати неформатирано или помоћу спољашњег уређивача текста."
 
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. страна од %d"
 
-#: ../mail/em-format-html.c:484 ../mail/em-format-html.c:486
+#: ../mail/em-format-html.c:486 ../mail/em-format-html.c:495
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Довлачење ’%s‘"
 
-#: ../mail/em-format-html.c:622
+#: ../mail/em-format-html.c:635
 msgid "Valid signature but cannot verify sender"
 msgstr "Исправан потпис али није могућа провера пошиљаоца"
 
-#: ../mail/em-format-html.c:893
+#: ../mail/em-format-html.c:906
 msgid "Malformed external-body part."
 msgstr "Лоше сложен спољни део поруке."
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:936
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Показивач на FTP страницу (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:947
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Показивач на локалну датотеку (%s) која одговара страници „%s“"
 
-#: ../mail/em-format-html.c:936
+#: ../mail/em-format-html.c:949
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Показивач на локалну датотеку (%s)"
 
-#: ../mail/em-format-html.c:957
+#: ../mail/em-format-html.c:970
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Показивач на мрежни податак (%s)"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:981
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Показивач на непознати спољни податак (типа „%s“)"
 
-#: ../mail/em-format-html.c:1195
+#: ../mail/em-format-html.c:1208
 msgid "Formatting message"
 msgstr "Обликовање поруке"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Шаље"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
 msgid "Reply-To"
 msgstr "Одговор"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
 msgid "Cc"
 msgstr "Копија (Cc)"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
 msgid "Bcc"
 msgstr "Невидљива копија (Bcc)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1665 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1045
+#: ../mail/em-format-html.c:1678 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1182
 msgid "Mailer"
 msgstr "Пошиљалац"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1692
+#: ../mail/em-format-html.c:1705
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1695
+#: ../mail/em-format-html.c:1708
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1705 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1718 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:855 ../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 "Датум"
 
-#: ../mail/em-format-html.c:1728 ../mail/em-format.c:855
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1741 ../mail/em-format.c:856
+#: ../mail/em-mailer-prefs.c:94
 msgid "Newsgroups"
 msgstr "Групе за вести"
 
-#: ../mail/em-format.c:1119
+#: ../mail/em-format.c:1120
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
 
-#: ../mail/em-format.c:1158 ../mail/em-format.c:1306 ../mail/em-format.c:1608
+#: ../mail/em-format.c:1159
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Није могућа обрада S/MIME поруке: непозната грешка"
 
-#: ../mail/em-format.c:1288 ../mail/em-format.c:1444
+#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Није могућа обрада MIME поруке. Приказивање извора."
 
-#: ../mail/em-format.c:1296
+#: ../mail/em-format.c:1300
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподржани тип шифре за multipart/encrypted"
 
-#: ../mail/em-format.c:1463
+#: ../mail/em-format.c:1310
+#, fuzzy
+msgid "Could not parse PGP/MIME message"
+msgstr "Није могућа обрада S/MIME поруке: непозната грешка"
+
+#: ../mail/em-format.c:1310
+#, fuzzy
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Није могућа обрада S/MIME поруке: непозната грешка"
+
+#: ../mail/em-format.c:1467
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
 msgid "Error verifying signature"
 msgstr "Грешка при провери потписа"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
 msgid "Unknown error verifying signature"
 msgstr "Непозната грешка при провери потписа"
 
+#: ../mail/em-format.c:1612
+#, fuzzy
+msgid "Could not parse PGP message"
+msgstr "Није могуће прављење поруке."
+
+#: ../mail/em-format.c:1612
+#, fuzzy
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Није могућа обрада S/MIME поруке: непозната грешка"
+
+# bug: requires a comment on usage
 # слично као за месеце и недеље
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Every time"
-msgstr "Сваки пут"
+msgstr "сваки пут"
 
-#: ../mail/em-mailer-prefs.c:104
+# bug: requires a comment on usage
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per day"
-msgstr "Једном дневно"
+msgstr "једном дневно"
 
-#: ../mail/em-mailer-prefs.c:105
+# bug: requires a comment on usage
+#: ../mail/em-mailer-prefs.c:107
 msgid "Once per week"
-msgstr "Једном недељно"
+msgstr "једном недељно"
 
-#: ../mail/em-mailer-prefs.c:106
+# bug: requires a comment on usage
+#: ../mail/em-mailer-prefs.c:108
 msgid "Once per month"
-msgstr "Једном месечно"
+msgstr "једном месечно"
+
+#: ../mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:785
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:806
+#, fuzzy
+msgid "No Junk plugin available"
+msgstr "Нема доступног описа."
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12413,48 +12260,48 @@ msgstr ""
 "\n"
 "Молим будите стрпљиви док Еволуција преноси фасцикле..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Није могуће прављење нове фасцикле ’%s‘: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Није могуће умножити фасциклу ’%s‘ у ’%s‘: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Није могућа претрага за постојећим поштанским сандучићима у ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Није могуће отварање старог POP чувај-на-серверу податка ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Није могуће прављење POP3 чувај-на-серверу директоријума података ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Није могуће умножавање POP3 чувај-на-серверу податка ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Није успело прављење локалне оставе поште ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2710
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Није могуће прављење локалних фасцикли поште у ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2729
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12462,16 +12309,16 @@ msgstr ""
 "Није могуће читање подешавања претходне инсталације Еволуције, ’evolution/"
 "config.xmldb‘ не постоји или је оштећен."
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 msgid "_Reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:568 ../mail/em-popup.c:579
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:632
 msgid "_Add to Address Book"
 msgstr "Додај у _именик"
 
@@ -12496,28 +12343,28 @@ msgstr "Изаберите сервер."
 msgid "No server has been selected"
 msgstr "Није изабран сервер"
 
-#: ../mail/em-utils.c:124
+#: ../mail/em-utils.c:120
 msgid "Do not show this message again."
 msgstr "Не приказуј поново ову поруку."
 
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:315
 msgid "Message Filters"
 msgstr "Пропусни_ци порука"
 
-#: ../mail/em-utils.c:404 ../mail/em-utils.c:436
+#: ../mail/em-utils.c:368
 msgid "message"
 msgstr "порука"
 
-#: ../mail/em-utils.c:571
+#: ../mail/em-utils.c:559
 msgid "Save Message..."
 msgstr "Сачувај поруку..."
 
-#: ../mail/em-utils.c:620
+#: ../mail/em-utils.c:608
 msgid "Add address"
 msgstr "Додај адресу"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1104
+#: ../mail/em-utils.c:1092
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке од %s"
@@ -12526,47 +12373,47 @@ msgstr "Поруке од %s"
 msgid "Search _Folders"
 msgstr "Фас_цикле претраге"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:590
 msgid "Search Folder source"
 msgstr "Извор фас_цикле претраге"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
 msgstr "Дозволи еволуцији да прикаже текстуални део ограничене величине"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Automatic link recognition"
 msgstr "Аутоматско препознавање веза"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Automatic smiley recognition"
 msgstr "Аутоматско препознавање смешака"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Check incoming mail being junk"
 msgstr "Провери да ли је пристигла пошта ђубре"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Citation highlight color."
 msgstr "Боја истицања цитата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Composer Window default height"
 msgstr "Подразумевана висина прозора састављача"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Composer Window default width"
 msgstr "Подразумевана ширина прозора састављача"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сажми приказ адреса у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА"
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12574,79 +12421,94 @@ msgstr ""
 "Сажми приказ адреса у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА на број назначен у "
 "address_count-у."
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Default charset in which to compose messages"
 msgstr "Подразумевани скуп знакова за састављање порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Default charset in which to compose messages."
 msgstr "Подразумевани скуп знакова за састављање порука."
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Default charset in which to display messages"
 msgstr "Подразумевани скуп знакова за приказ порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to display messages."
 msgstr "Подразумевани скуп знакова за приказ порука."
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default forward style"
 msgstr "Подразумевани стил прослеђивања"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default height of the Composer Window"
 msgstr "Подразумевана висина прозора састављача"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default height of the Message Window"
 msgstr "Подразумевана висина прозора за поруку"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default height of the Subscribe dialog"
 msgstr "Подразумевана висина прозора за пријаву"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default reply style"
 msgstr "Подразумевани стил одговора"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+msgid "Default value for thread expand state"
+msgstr "Подразумеван наслов поруке."
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default width of the Composer Window"
 msgstr "Подразумевана ширина прозора састављача"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default width of the Message Window"
 msgstr "Подразумевана ширина прозора за поруку"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default width of the Subscribe dialog"
 msgstr "Подразумевана ширина прозора за пријаву"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Directory for saving mail component files"
 msgstr "Директоријум за чување датотека модула за пошту"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Исцртава ознаке грешки при куцању уз речи док куцате."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
+#, fuzzy
+msgid "Empty Junk folders on exit"
+msgstr "Празни фасцикле са смећем на излазу"
+
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Empty Trash folders on exit"
 msgstr "Празни фасцикле са смећем на излазу"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:28
+#, fuzzy
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Празни све фасцикле са смећем при затварању Еволуције."
+
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Празни све фасцикле са смећем при затварању Еволуције."
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогућава приказ курзора, тако да видите курзор док читате поруку."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Enable or disable type ahead search feature"
 msgstr "Укључи или искључи могућност тражења куцања у напред"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12659,23 +12521,23 @@ msgstr ""
 "аутоматски на ту фасциклу."
 
 # bug: unclear
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Enable to render message text part of limited size."
 msgstr "Укључите да исцртавате текстуални део поруке ограничене величине."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курзора"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Height of the message-list pane"
 msgstr "Висина површи листе порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Height of the message-list pane."
 msgstr "Висина површи листе порука."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12683,7 +12545,7 @@ msgstr ""
 "Уколико корисник покуша да отвори 10 или више порука одједном, пита га да ли "
 "заиста жели то да уради."
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12691,7 +12553,7 @@ msgstr ""
 "Ako je „Преглед поркуе“ површ укључена, онда покажите је једну до друге "
 "радије него усправно."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:39
 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 "
@@ -12701,27 +12563,38 @@ msgstr ""
 "mime типови са ове листе који су везани bonobo прегледачем делова у Гномовој "
 "бази mime типова могу бити коришћени за приказ садржаја."
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid ""
+"It disables the feature where repeated prompts to ask if offline sync is "
+"required."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "То укључује/искључује упозорење када означавате више порука."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:42
+#, fuzzy
+msgid "Last time empty junk was run"
+msgstr "Последње време пражњења смећа"
+
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Last time empty trash was run"
 msgstr "Последње време пражњења смећа"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "List of Labels and their associated colors"
 msgstr "Листа ознака и њима додељених боја"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "List of accepted licenses"
 msgstr "Листа прихваћених лиценци"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "List of accounts"
 msgstr "Листа налога"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12729,11 +12602,11 @@ msgstr ""
 "Листа налога које познаје поштански део Еволуције. Листа садржи низове које "
 "именују поддиректоријуме у односу на /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "List of custom headers and whether they are enabled."
 msgstr "Листа прилагођених заглавља и да ли су укључена."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
 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."
@@ -12741,19 +12614,19 @@ msgstr ""
 "Листа ознака које познаје поштански део Еволуције. Листа садржи низове "
 "облика име:боја где боја користи HTML hex кодирање."
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Листа mime типова ради провере за bonobo прегледачима"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "List of protocol names whose license has been accepted."
 msgstr "Листа имена протокола чија је лиценца прихваћена."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Load images for HTML messages over http"
 msgstr "Учитава слике за HTML поруке преко http-а"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
 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 "
@@ -12763,96 +12636,110 @@ msgstr ""
 "Никада не учитавај слике са мреже 1. - Учитавај слике уколико је пошиљалац у "
 "именику 2 - Увек учитавај слике са мреже"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Log filter actions"
 msgstr "Бележи радње филтера"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи радње филтера у наведену датотеку дневника."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење радњи филтера"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење радњи филтера."
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава као виђену после наведеног рока"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава као виђену после наведеног рока."
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Message Window default height"
 msgstr "Подразумевана висина прозора за поруку"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Message Window default width"
 msgstr "Подразумевана ширина прозора за поруку"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Стил приказа поруке ( „нормалан“, „сва заглавља“, „извор“)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
+#, fuzzy
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Најмање дана између пражњења смећа на излазу"
+
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:67
+#, fuzzy
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Најмање време између пражњења смећа на излазу, у данима."
+
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа на излазу, у данима."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "New Mail Notify sound file"
 msgstr "Звучна датотека за обавештење о новој пошти"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "New Mail Notify type"
 msgstr "Тип обавештења о новој пошти"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Број адреса за приказ у ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Prompt on empty subject"
 msgstr "Пита када је наслов празан"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Пита корисника када покуша да испразни фасциклу."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Пита корисника када покуша да пошаље поруку без наслова."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Prompt when user expunges"
 msgstr "Пита при пражњењу"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Prompt when user only fills Bcc"
 msgstr "Пита када корисник унесе само невидљиву копију (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Пита корисника када покуша да отвори 10 или више порука одједном"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12860,110 +12747,132 @@ msgstr ""
 "Пита када корисник покуша да пошаље HTML поруку примаоцима који можда не "
 "желе да примају HTML пошту."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Пита корисника када покуша да пошаље поруку без прималаца."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Пита када корисник покуша да пошаље нежељени HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Prompt while marking multiple messages"
 msgstr "Пита при означавању више порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Recognize links in text and replace them."
 msgstr "Препознаje везе у тексту и замењује их."
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Препознаје смешке у тексту и замењује их сликама."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Run junk test on incoming mail"
 msgstr "Провери да ли има ђубрета у долазној пошти"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Save directory"
 msgstr "Сачувај директоријум"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Send HTML mail by default"
 msgstr "Подразумевано шаљи пошту као HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Send HTML mail by default."
 msgstr "Подразумевано шаље пошту као HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Show Animations"
 msgstr "Прикажи анимације"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Приказује обрисане поруке (као прецртане) у листи порука."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Show deleted messages in the message-list"
 msgstr "Прикажи обрисане поруке у листи порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Show photo of the sender"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
 "list"
 msgstr "Прикажи е-адресу пошиљаоца у сложеној колони у списку порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:98
+#, fuzzy
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Прикажи е-адресу пошиљаоца у сложеној колони у списку порука"
+
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Show the sender email in the messages column in the message list"
 msgstr "Прикажи е-адресу пошиљаоца у колони за поруке у списку порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Sound file to play when new mail arrives."
 msgstr "Звучна датотека за пуштање када стигне нова пошта."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Наводи тип обавештења о новој пошти које корисник жели да користи."
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Spell check inline"
 msgstr "Провера правописа унутар"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Subscribe dialog default height"
 msgstr "Подразумевана висина прозора за пријаву"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Subscribe dialog default width"
 msgstr "Подразумевана ширина прозора за пријаву"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Terminal font"
 msgstr "Словни лик терминала"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Text message part limit"
 msgstr "Ограничење текстуалног дела поруке"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+#, fuzzy
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "Време пражњења смећа, у данима од почетка епохе."
+
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Време пражњења смећа, у данима од почетка епохе."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "The terminal font for mail display"
 msgstr "Словни лик терминала за приказ поште"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "The variable width font for mail display"
 msgstr "Словни лик променљиве величине за приказ поште"
 
 # bug: s/interms/in terms/ (space)
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:112
 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."
@@ -12971,7 +12880,14 @@ msgstr ""
 "Ово одређује највећу величину текстуалног дела који се може исцртати у "
 "Еволуцији. Подразумева се 4MB/4096 KB и наведено је као број KB."
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:113
+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."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
 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;"
@@ -12982,7 +12898,11 @@ msgstr ""
 "заглавља и потребу њиховог приказивања. XML структура је формата &lt;header "
 "enabled&gt; - омогућено за приказивање заглавља у прегледу поште."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12990,103 +12910,111 @@ msgstr ""
 "Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, "
 "после чега је „...“ приказано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Thread the message list."
 msgstr "Разврстава списак порука по расправама."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Thread the message-list"
 msgstr "Разврстај поруке по расправама"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Thread the message-list based on Subject"
 msgstr "Прикажи поруке према наслову расправе"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Timeout for marking message as Seen"
 msgstr "Време за означавање порука као виђене"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Timeout for marking message as Seen."
 msgstr "Време за означавање порука као виђене."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "UID string of the default account."
 msgstr "ЈИБ низ подразумеваног налога."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.h:124
+#, fuzzy
+msgid "Use SpamAssassin daemon and client"
 msgstr "Користи сервис и клијента Убице спама"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:125
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)"
 msgstr "Користи сервис и клијента Убице спама (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Use custom fonts"
 msgstr "Користи сопствени словни лик"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Use custom fonts for displaying mail"
 msgstr "Користи сопствени словни лик за приказ поште"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Use only local spam tests."
 msgstr "Користи само локалне провере спама."
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи само локалне провере спама (без DNS-а)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Use side-by-side or wide layout"
 msgstr "Користите један до другог или широки распоред"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Variable width font"
 msgstr "Словни лик променљиве величине"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "View/Bcc menu item is checked"
 msgstr "Опција Преглед/невидљива копија (Bcc) је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "View/Bcc menu item is checked."
 msgstr "Опција Преглед/невидљива копија (Bcc) је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "View/Cc menu item is checked"
 msgstr "Опција Преглед/копија (Cc) је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "View/Cc menu item is checked."
 msgstr "Опција Преглед/копија (Cc) је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "View/From menu item is checked"
 msgstr "Опција Преглед/шаље је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "View/From menu item is checked."
 msgstr "Опција Преглед/шаље је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "View/PostTo menu item is checked"
 msgstr "Опција Преглед/прима је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "View/PostTo menu item is checked."
 msgstr "Опција Преглед/пошаљи је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "View/ReplyTo menu item is checked"
 msgstr "Опција Преглед/одговор је изабрана"
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "View/ReplyTo menu item is checked."
 msgstr "Опција Преглед/одговор је изабрана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13094,11 +13022,11 @@ msgstr ""
 "Да ли покушати приказ низа расправе по наслову када поруке не садрже "
 "заглавља „In-Reply-To“ или „References“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Width of the message-list pane"
 msgstr "Ширина површи листе порука"
 
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Width of the message-list pane."
 msgstr "Ширина површи листе порука."
 
@@ -13115,12 +13043,10 @@ msgid "Import mail from Elm."
 msgstr "Важна пошта из програма Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Одредишна фасцикла:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Изаберите фасциклу за увоз"
 
@@ -13132,110 +13058,20 @@ msgstr "Беркли поштанско сандуче (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увозник за фасцикле облика Беркли поштанског сандучета"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "Увожење ’%s‘"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "Сачекајте"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "Увожење поштанског сандучета"
 
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#, c-format
+msgid "Importing `%s'"
+msgstr "Увожење ’%s‘"
+
 #: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Претрага %s"
 
-#: ../mail/importers/netscape-importer.c:74
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Филтер важности „%s“"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Неки од Netscape филтера за пошту засновани су\n"
-"на приоритетима које Еволуција не користи.\n"
-"Уместо тога Еволуција даје резултате у распону од\n"
-"-3 до 3 који се додељују порукама и у складу са тиме\n"
-"филтрирају.\n"
-"\n"
-"Као привремено решење, додата је група филтера имена \n"
-"„Приоритетни филтер“ која претвара Netscape филтере за пошту у\n"
-"резултате Еволуције, а промењени филтери користе резултате уместо\n"
-"приоритета. Проверите увежене филтере да се уверите\n"
-"да ли све ради као што би требало."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Неки од Netscape филтера за пошту користе\n"
-"могућност „Занемари расправу“ или „Прати расправу“\n"
-"коју Еволуција не подржава.\n"
-"Ови филтери ће бити изостављени."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Неки од Netscape филтера за пошту проверавају\n"
-"да ли у телу порука постоји (не)једнакост за дати низ,\n"
-"што Еволуција не подржава. Ови филтери\n"
-"су промењени да проверавају да ли тај низ јесте\n"
-"или није садржан у телу поруке."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Еволуција увози старе Netscape податке"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Увожење Netscape података"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Подешавања"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "Филтери поште"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Еволуција је пронашла Netscape датотеке поште.\n"
-"Желите ли да буду увежене у Еволуцију?"
-
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Увожење Pine података"
@@ -13272,7 +13108,7 @@ msgstr "%s дописна листа"
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:531
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13280,7 +13116,7 @@ msgstr[0] "%d обрисано"
 msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:533
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13288,7 +13124,7 @@ msgstr[0] "%d ђубре"
 msgstr[1] "%d ђубрета"
 msgstr[2] "%d ђубрета"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:536
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13296,7 +13132,7 @@ msgstr[0] "%d у припреми"
 msgstr[1] "%d у припреми"
 msgstr[2] "%d у припреми"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:538
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13304,7 +13140,7 @@ msgstr[0] "%d послато"
 msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:540
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13312,7 +13148,15 @@ msgstr[0] "%d непослато"
 msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:546
+#, fuzzy, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ", %d непрочитано"
+msgstr[1] ", %d непрочитане"
+msgstr[2] ", %d непрочитаних"
+
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13320,48 +13164,48 @@ msgstr[0] "%d укупно"
 msgstr[1] "%d укупно"
 msgstr[2] "%d укупно"
 
-#: ../mail/mail-component.c:558
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d непрочитано"
-msgstr[1] ", %d непрочитане"
-msgstr[2] ", %d непрочитаних"
+#: ../mail/mail-component.c:551
+#, fuzzy, c-format
+msgid " %d selected, "
+msgid_plural " %d selected, "
+msgstr[0] ", %d изабрано"
+msgstr[1] "%d изабрана"
+msgstr[2] "%d изабраних"
 
-#: ../mail/mail-component.c:840
+#: ../mail/mail-component.c:876
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:877
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:878
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: ../mail/mail-component.c:848
+#: ../mail/mail-component.c:884
 msgid "New Mail Folder"
 msgstr "Нова фасцикла за пошту"
 
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:885
 msgid "Mail _Folder"
 msgstr "_Фасцикла за пошту"
 
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:886
 msgid "Create a new mail folder"
 msgstr "Направи нову фасциклу за пошту"
 
-#: ../mail/mail-component.c:996
+#: ../mail/mail-component.c:1033
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Неуспела надоградња подешавања поште или фасцикли."
 
-#: ../mail/mail-config.c:85
+#: ../mail/mail-config.c:81
 msgid "I_mportant"
 msgstr "Важ_но"
 
 #. red
-#: ../mail/mail-config.c:86
+#: ../mail/mail-config.c:82
 msgid "_Work"
 msgstr "По_сао"
 
@@ -13369,17 +13213,17 @@ msgstr "По_сао"
 # Create the default Person task list
 # orange
 #. orange
-#: ../mail/mail-config.c:87
+#: ../mail/mail-config.c:83
 msgid "_Personal"
 msgstr "Л_ично"
 
 #. forest green
-#: ../mail/mail-config.c:88
+#: ../mail/mail-config.c:84
 msgid "_To Do"
 msgstr "За уради_ти"
 
 #. blue
-#: ../mail/mail-config.c:89
+#: ../mail/mail-config.c:85
 msgid "_Later"
 msgstr "Касни_је"
 
@@ -13392,53 +13236,54 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL није подржан у овој верзији Еволуције</b>"
 
 #: ../mail/mail-config.glade.h:4
-msgid "<b>Sig_natures</b>"
-msgstr "<b>По_тписи</b>"
+#, fuzzy
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>Опције календара</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>_Languages</b>"
-msgstr "<b>_Језици</b>"
+msgid "<b>Sig_natures</b>"
+msgstr "<b>По_тписи</b>"
 
 #: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Ово ће учинити филтер поузданијим, али споријим</small>"
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:7
+msgid "<b>_Languages</b>"
+msgstr "<b>_Језици</b>"
+
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Подаци о налогу</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Тип аутентификације</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Аутентификација</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Састављање порука</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Подешавање</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Подразумевано понашање</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Брише пошту</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Приказана _заглавља порука</span>"
 
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">Могућности филтера</span>"
-
 #: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Ознаке и боје</span>"
@@ -13620,134 +13465,133 @@ msgstr "Под_разумевано"
 msgid "Default character e_ncoding:"
 msgstr "Подразумеванa _кодна страна:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk mails on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Дигитално потпиши одлазеће поруке (подразумевано)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not format text contents in mails if the text si_ze exceeds"
 msgstr "Не исцртавај садржај текста порука ако величина прела_зи"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Не цитирај оригиналну поруку"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Done"
 msgstr "Готово"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 msgid "Drafts _Folder:"
 msgstr "_Фасцикла Припрема:"
 
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "О_могући"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "Налози е-поште"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "Електронска _адреса:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "Испразни фасцикле са _смећем на излазу"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за ши_фровање:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:80
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Шифруј одлазеће поруке (подразумевано)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed width Font:"
 msgstr "Словни лик сразмерне ширине:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Утврђене-пирине:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Особине словног лика"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Обликуј поруке у H_TML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Full Nam_e:"
 msgstr "Име и презиме:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "HTML Mail"
 msgstr "HTML пошта"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: ../mail/mail-config.glade.h:90
-msgid "I_nclude remote tests"
-msgstr "У_кључи мрежне провере"
-
 #: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Унутар"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:94
+msgid "Inline original message (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:96
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Languages Table"
 msgstr "Табела језика"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Configuration"
 msgstr "Подешавање поште"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Headers Table"
 msgstr "Табела заглавља поште"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mailbox location"
 msgstr "Место поштанског сандучета"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Message Composer"
 msgstr "Састављач поруке"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Напомена: нећете бити упитани за лозинку док се не повежете први пут"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG ИБ _кључа:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Пусти звучну датотеку када стигне нова пошта"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13755,7 +13599,7 @@ msgstr ""
 "Унесите доле описно име за овај налог.\n"
 "Ово име ће бити коришћено само за потребе приказа."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13763,7 +13607,7 @@ msgstr ""
 "Унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, "
 "питајте администратора система или продавца Интернет услуга."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 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 "
@@ -13772,122 +13616,126 @@ msgstr ""
 "Унесите доле име и електронску адресу. „Необавезна“ поља доле не морају бити "
 "попуњена, осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "Молим изаберите међу следећим могућностима"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Упозори када шаљеш поруке само са наведеним Bcc примаоцима"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "Цитирај оригиналну поруку"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "З_апамти лозинку"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Запа_мти лозинку"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "Изаб_ери..."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "_Пошаљи признанице:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "_Стандардни словни лик:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Se_lect..."
 msgstr "Иза_бери..."
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Изаберите HTML словни лик фиксиране величине"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML fixed width font for printing"
 msgstr "Изаберите HTML словни лик фиксиране величине за штампу"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font"
 msgstr "Изаберите HTML словни лик променљиве величине"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML variable width font for printing"
 msgstr "Изаберите HTML словни лик променљиве величине за штампу"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Select sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
 msgid "Sending Mail"
 msgstr "Слање поште"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Sent _Messages Folder:"
 msgstr "Фасцикла послатих _порука:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи аутентификацију"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Server _Type: "
 msgstr "_Тип сервера: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Sig_ning certificate:"
 msgstr "Сертификат за _потписивање:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "Signat_ure:"
 msgstr "Потп_ис:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Signatures Table"
 msgstr "Табела потписа"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Specify _filename:"
 msgstr "Одреди име _датотеке:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "T_ype: "
 msgstr "Т_ип: "
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Листа језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13897,7 +13745,7 @@ msgstr ""
 "потпис. Име које сте дали ће бити коришћено\n"
 "само за сврху приказивања на екрану. "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13905,15 +13753,15 @@ msgstr ""
 "Укуцајте име по коме желите да назовете овај налог.\n"
 "На пример: „Пословни“ или „Лични“"
 
-#: ../mail/mail-config.glade.h:150 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:152 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:153
 msgid "V_ariable-width:"
 msgstr "Про_менљива величина:"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13923,88 +13771,100 @@ msgstr ""
 "\n"
 "Кликните „Напред“ за почетак. "
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Увек учитавај слике са Интернета"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Немој да ме обавештаваш када стигне нова пошта"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:162
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанке (Outlook компатибилност)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања:"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Load images in mail from contacts"
 msgstr "_Учитај слике од контаката у поруку"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:167
 msgid "_Make this my default account"
 msgstr "_Нека ово буде мој подразумевани налог"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:168
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:170
 msgid "_Never load images from the Internet"
 msgstr "_Никада не учитавај слике са Интернета"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Путања:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:172
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Упозори када шаљеш HTML поруке онима који их не желе"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:173
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Упозори када шаљеш поруке без наслова"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:174
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:175
 msgid "_Script:"
 msgstr "_Скрипта:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:178
 msgid "_Show image animations"
 msgstr "Прикажи _анимације"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:179
+msgid "_Show the photograph of sender in the email preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:180
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Сажмите ПРИМА/КОПИЈА/НЕВИДЉИВА КОПИЈА заглавља у "
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Користи сигурну везу:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:182
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи исте словне ликове као други програми"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:183
 msgid "addresses"
 msgstr "Адресе"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:184
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:185
 msgid "description"
 msgstr "опис"
 
@@ -14041,7 +13901,7 @@ msgid "Case _sensitive"
 msgstr "_Осетљиво на величину слова"
 
 # timezone.
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "За_вршено"
 
@@ -14054,7 +13914,6 @@ msgid "Find in Message"
 msgstr "Пронађи у поруци"
 
 #: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
@@ -14082,7 +13941,7 @@ msgstr "Сигурносни подаци"
 msgid "Specific folders"
 msgstr "Нведене фасцикле"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14094,11 +13953,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "_Прихвати лиценцу"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "_Рок:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "_Ознака:"
 
@@ -14106,7 +13965,7 @@ msgstr "_Ознака:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Оз_начите ово да прихватите уговор о лиценци"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:875
 #, c-format
 msgid "Pinging %s"
 msgstr "Испитујем доступност за %s"
@@ -14150,7 +14009,7 @@ msgstr "Слање поруке %d од %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Неуспело слање %d од %d порука"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:696
 msgid "Canceled."
 msgstr "Отказано."
 
@@ -14281,54 +14140,59 @@ msgstr "Прекидање везе са %s"
 msgid "Reconnecting to %s"
 msgstr "Поновно повезивање на %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2361
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Exchange налог није на мрежи."
+
+#: ../mail/mail-ops.c:2444
 msgid "Checking Service"
 msgstr "Провера услуге"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:161
 msgid "Canceling..."
 msgstr "Одустајање је у току..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:387
 msgid "Send & Receive Mail"
 msgstr "Слање и примање поште"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Обустави _све"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Освежавање..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:575
 msgid "Waiting..."
 msgstr "Чекање..."
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:783
 msgid "Checking for new mail"
 msgstr "Провера за нове поруке"
 
-#: ../mail/mail-session.c:198
+#: ../mail/mail-session.c:202
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Унесите лозинку за %s"
 
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:204
 msgid "Enter Passphrase"
 msgstr "Унесите лозинку"
 
-#: ../mail/mail-session.c:203
+#: ../mail/mail-session.c:207
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:209
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: ../mail/mail-session.c:243
+#: ../mail/mail-session.c:251
 msgid "User canceled operation."
 msgstr "Корисник је обуставио операцију."
 
@@ -14610,55 +14474,66 @@ msgid "Discard changes?"
 msgstr "Занемарити промењено?"
 
 #: ../mail/mail.error.xml.h:46
-msgid "Do not delete"
+#, fuzzy
+msgid "Do not d_elete"
 msgstr "Не бриши"
 
 #: ../mail/mail.error.xml.h:47
+msgid "Do not delete"
+msgstr "Не бриши"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do not disable"
 msgstr "Немој искључити"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Да ли желите да ову радњу примените на све подфасцикле?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Да ли желите да све поруке означите као прочитане?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Желите ли да сачувате промене?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Унесите лозинку."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Грешка при учитавању дефиниција филтера."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Грешка током операције."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Грешка приликом {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "Датотека постоји, није могуће преписивање."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "Датотека постоји али није регуларна."
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Уколико наставите, нећете моћи да вратите ове поруке."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14666,11 +14541,11 @@ msgstr ""
 "Уколико обришете фасциклу, сав њен садржај и садржај подфасцикли ће бити "
 "трајно обрисани."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ако наставите, сви посреднички налози биће трајно уклоњени."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14678,11 +14553,11 @@ msgstr ""
 "Уколико наставите, подаци налога и сви припадајући\n"
 "подаци ће бити трајно обрисани."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наставите, подаци налога биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14690,19 +14565,19 @@ msgstr ""
 "Уколико изађете, ове поруке неће бити послате док поново не покренете "
 "Еволуцију."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "Занемари"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "Неисправна аутентификација"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "Филтери поште су аутоматски освежени."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14713,39 +14588,39 @@ msgstr ""
 "BCC примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. "
 "Да би избегли ово, додајте барем једног Прима: или CC: примаоца."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mark all messages as read"
 msgstr "Означи све поруке као прочитане"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mark all messages in subfolders as read?"
 msgstr "Означи све поруке као прочитане у подфасцикли"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid "Mark as _Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Недостаје фасцикла."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Извори нису изабрани."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отварање превише порука одједном може сувише да потраје."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Проверите подешавања налога и покушајте поново."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Молим одобрите налог или пошаљите коришћењем неког другог."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14753,7 +14628,7 @@ msgstr ""
 "Унесите важећу електронску адресу у поље Прима:. Можете претражити "
 "електронске адресе кликом на дугме Прима: поред поља за унос."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14764,50 +14639,60 @@ msgstr ""
 "{0}\n"
 "Ипак послати?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please provide an unique name to identify this signature."
 msgstr "Молим дајте једно јединствено име које представља овај потпис."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Please wait."
 msgstr "Сачекајте."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Проблем при преносу старе фасцикле поште &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server"
 msgstr "Слање упита серверу"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Слање упита серверу за листу подржаних механизама аутентификације."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Read receipt requested."
 msgstr "Затражене признанице."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Заиста обрисати фасциклу &quot;{0}&quot; и све подфасцикле?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Search Folders automatically updated."
 msgstr "Фасцикле претраге су аутоматски освежене."
 
 # bug(slobo): вероватно извештај о достави
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Send Receipt"
 msgstr "Пошаљи признаницу"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
 msgid "Signature Already Exists"
 msgstr "Потпис већ постоји"
 
+#: ../mail/mail.error.xml.h:94
+#, fuzzy
+msgid "Synchronize"
+msgstr "Усклади са iPod џепним уређајем"
+
+#: ../mail/mail.error.xml.h:95
+#, fuzzy
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Овај календар није означен за коришћење ван мреже."
+
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14815,7 +14700,7 @@ msgstr ""
 "Системске фасцикле неопходне да би Еволуција исправно радила се не могу "
 "преименовати, преместити или обрисати."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14830,7 +14715,7 @@ msgstr ""
 "BCC примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. "
 "Да би избегли ово, додајте барем једног Прима: или CC: примаоца."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14844,7 +14729,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "И сада је(су) освежена(е)."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14858,11 +14743,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "И сада је(су) освежено(а)."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
 msgid "The script file must exist and be executable."
 msgstr "Датотека скрипте мора постојати и бити извршна."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14870,18 +14755,18 @@ msgstr ""
 "Ова фасцикла је можда посредно додата,\n"
 "идите у уређивач фасцикле претраге и додајте је изричито, ако желите."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ова порука се не може послати пошто је искључен налог са којег шаљете"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Ова порука се не може послати пошто нисте навели ниједног примаоца"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14889,22 +14774,22 @@ msgstr ""
 "Овај сервер не подржава тражени тип аутентификације и можда уопште не "
 "подржава аутентификацију."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:116
 msgid "This signature has been changed, but has not been saved."
 msgstr "Овај потпис је промењен, али није сачуван."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "Ово означава све поруке као прочитане у изабраној фасцикли и подфасциклама."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to connect to the GroupWise server."
 msgstr "Неуспело повезивање на GroupWise сервер."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14912,39 +14797,39 @@ msgstr ""
 "Није могуће отварање фасцикле за припрему за овај налог.  Користити "
 "системску фасциклу за припрему?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:120
 msgid "Unable to read license file."
 msgstr "Није могуће читање датотеке лиценце."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:121
 msgid "Use _Default"
 msgstr "Користи _подразумевано"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:122
 msgid "Use default drafts folder?"
 msgstr "Користити подразумевану фасциклу за припрему?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
 msgid "You have not filled in all of the required information."
 msgstr "Нисте унели све потребне податке."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:125
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непослате поруке, желите ли ипак да изађете?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:126
 msgid "You may not create two accounts with the same name."
 msgstr "Не можете отворити два налога истог имена."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:127
 msgid "You must name this Search Folder."
 msgstr "Морате именовати ову фасциклу претраге."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:128
 msgid "You must specify a folder."
 msgstr "Морате навести фасциклу."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14954,27 +14839,32 @@ msgstr ""
 "Било појединачним избором фасцикли, и/или избором свих локалних фасцикли, "
 "свих мрежних фасцикли или и једних и других."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Пријава на сервер &quot;{0}&quot; као &quot;{0}&quot; није успела."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Append"
 msgstr "_Додај"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:133
 msgid "_Discard changes"
 msgstr "_Занемари промене"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:134
 msgid "_Do not Mark as Read"
 msgstr "Ос_тави непрочитано"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
+#, fuzzy
+msgid "_Do not Synchronize"
+msgstr "Не спаша_вај"
+
+#: ../mail/mail.error.xml.h:137
 msgid "_Expunge"
 msgstr "Из_баци"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:138
 msgid "_Open Messages"
 msgstr "_Отвори поруке"
 
@@ -15014,38 +14904,38 @@ msgstr "Више"
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:1469 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476 ../plugins/itip-formatter/itip-view.c:202
+#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Данас %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче %l:%M %p"
 
-#: ../mail/message-list.c:1497 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1507 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2263 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2306 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "Поруке"
 
-#: ../mail/message-list.c:3654
+#: ../mail/message-list.c:3752
 msgid "Generating message list"
 msgstr "Прављење листе порука"
 
@@ -15158,39 +15048,138 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Додатак за звук унутар поруке"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:96
+#, fuzzy
+msgid "Select name of the Evolution archive"
 msgstr "Изаберите име архиве Еволуције"
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "_Поново покрени Еволуцију након прављења резерве"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:139
+#, fuzzy
+msgid "Select name of the Evolution archive to restore"
 msgstr "Изаберите архиву Еволуције за повраћај"
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr "_Поново покрени Еволуцију након повраћаја"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr ""
+
+#: ../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"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:244
+#, fuzzy
+msgid "_Restore Evolution from the backup archive"
+msgstr "_Поново покрени Еволуцију након прављења резерве"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+#, fuzzy
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Изаберите архиву Еволуције за повраћај"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+#, fuzzy
+msgid "Choose a file to restore"
+msgstr "Изаберите датотеку"
+
+#: ../plugins/backup-restore/backup.c:40
 msgid "Backup Evolution directory"
 msgstr "Директоријум за резерву Еволуције"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
 msgid "Restore Evolution directory"
 msgstr "Директоријум за повраћај Еволуције"
 
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:44
 msgid "Check Evolution archive"
 msgstr "Проверава архиву Еволуције"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
 msgstr "Поново покреће Еволуцију"
 
+#: ../plugins/backup-restore/backup.c:48
+#, fuzzy
+msgid "With GUI"
+msgstr "Ширина"
+
+#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:107
+#, fuzzy
+msgid "Shutting down Evolution"
+msgstr "Гашење %s (%s)\n"
+
+#: ../plugins/backup-restore/backup.c:72
+#, fuzzy
+msgid "Backing Evolution accounts and settings"
+msgstr "Прави резерву и опоравља податке и подешавања Еволуције"
+
+#: ../plugins/backup-restore/backup.c:77
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:87
+#, fuzzy
+msgid "Backup complete"
+msgstr "_Обележи као незавршено"
+
+# shell:noshell-reason title
+#: ../plugins/backup-restore/backup.c:92
+#: ../plugins/backup-restore/backup.c:133
+#, fuzzy
+msgid "Restarting Evolution"
+msgstr "Поново покреће Еволуцију"
+
+#: ../plugins/backup-restore/backup.c:111
+#, fuzzy
+msgid "Backup current Evolution data"
+msgstr "Директоријум за резерву Еволуције"
+
+#: ../plugins/backup-restore/backup.c:116
+msgid "Extracting files from the archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:122
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "Измени подешавања Еволуције"
+
+#: ../plugins/backup-restore/backup.c:126
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:244
+#, fuzzy, c-format
+msgid "Backing up to %s"
+msgstr "Пошта за %s"
+
+#: ../plugins/backup-restore/backup.c:249
+#, fuzzy, c-format
+msgid "Restoring from %s"
+msgstr "Уклањање фасцикле %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:264
+#, fuzzy
+msgid "Evolution Backup"
+msgstr "Еволуција пошта"
+
+#: ../plugins/backup-restore/backup.c:264
+#, fuzzy
+msgid "Evolution Restore"
+msgstr "Проба Еволуције"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Додатак за израду резерве и опоравак података и подешавања Еволуције."
@@ -15200,49 +15189,88 @@ msgstr "Додатак за израду резерве и опоравак по
 msgid "Backup and restore plugin"
 msgstr "Додатак за израду резерве и опоравак"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "Подешавања за резерву..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#, fuzzy
+msgid "Are you sure you want to close Evolution?"
+msgstr "Сигурно желите да обришете овај налог?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../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 "Сигурно желите да обришете овај састанак?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Invalid Evolution archive"
+msgstr "Проверава архиву Еволуције"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
+msgid "Please select a valid archive file to restore."
+msgstr "Изаберите архиву Еволуције за повраћај"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "Прави резерву и опоравља податке и подешавања Еволуције"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
+msgid "R_estore Settings..."
 msgstr "Опоравља подешавања..."
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "_Backup Settings..."
+msgstr "Подешавања за резерву..."
+
+#: ../plugins/bbdb/bbdb.c:459 ../plugins/bbdb/bbdb.c:468
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Аутоматски контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
+#: ../plugins/bbdb/bbdb.c:483
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Аутоматски направи уносе у именик при одговарању на пошту"
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:489
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изабери именик за Аутоматске контакте"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:504
 msgid "Instant Messaging Contacts"
 msgstr "Брзе поруке"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:519
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "Повремено усклади податке о контактима и слике са мог брзог гласника"
 
-#: ../plugins/bbdb/bbdb.c:513
+#: ../plugins/bbdb/bbdb.c:525
 msgid "Select Address book for Gaim buddy list"
 msgstr "Изабери именик за брог гласниа"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:536
 msgid "Synchronize with _buddy list now"
 msgstr "Усклади са _листом другара сада"
 
@@ -15260,10 +15288,29 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+msgid "Convert mail text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail text to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
 #: ../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
+msgid "_URL:"
+msgstr "_Адреса :"
+
 #: ../plugins/caldav/caldav-source.c:269
 msgid "Use _SSL"
 msgstr "Користи шифровану везу"
@@ -15284,6 +15331,11 @@ msgstr "Локални календари"
 msgid "Provides core functionality for local calendars."
 msgstr "Даје основну употребу локалним календарима."
 
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:546
+msgid "_Refresh:"
+msgstr "О_свежи:"
+
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
 msgstr "_Користи сигурну везу"
@@ -15329,15 +15381,15 @@ msgstr "Време: грмљавине"
 msgid "Select a location"
 msgstr "Изаберите место"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "_Јединице:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Метричне (Целзијус, цм, итд.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Империјалне (Фаренхајт, инчи, итд.)"
 
@@ -15361,11 +15413,11 @@ msgstr ""
 msgid "Copy tool"
 msgstr "Алат за умножавање"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Провери да ли је Еволуција подразумевани програм за пошту"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -15482,7 +15534,8 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "Управљајте подешавањима делегата за налог Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+#, fuzzy
+msgid "Delegation Assistant"
 msgstr "Помоћник за делегирање"
 
 #. Miscelleneous settings
@@ -15504,35 +15557,35 @@ msgstr "Величина фасцикли"
 msgid "Exchange Settings"
 msgstr "Exchange подешавања"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:617
 msgid "_OWA URL:"
 msgstr "_OWA адреса:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:643
 msgid "A_uthenticate"
 msgstr "А_утентификуј"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:836
 msgid "Authentication Type"
 msgstr "Тип аутентификације"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:850
 msgid "Ch_eck for Supported Types"
 msgstr "_Провери подржане типове"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:215
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
+#: ../plugins/exchange-operations/exchange-contacts.c:214
 msgid "0 KB"
 msgstr "0 КБ"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15578,69 +15631,106 @@ msgid "Your password will expire in the next %d days"
 msgstr "Број дана након којих Ваша лозинка истиче: %d"
 
 #. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:156
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "Custom"
 msgstr "Прилагођено"
 
+#: ../plugins/exchange-operations/exchange-delegates-user.c:183
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "Уређивач (чита, прави, уређује)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:187
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Аутор (чита, прави)"
+
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "Рецензент (само чита)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:241
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Делегирај овлашћења"
 
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:252
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 msgstr "Овлашћења за %s"
 
+#: ../plugins/exchange-operations/exchange-delegates-user.c:339
+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"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:392
+#, c-format
+msgid "You have been designated \t\t\t\t\t\tas a delegate for %s"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "Делегирај"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Уклонити делегата %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 msgid "Could not access Active Directory"
 msgstr "Није могуће приступити активном директоријуму"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr "Није могуће пронаћи себе у активном директоријуму"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Није могуће пронаћи делегата %s у активном директоријуму"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Није могуће уклонити делегата %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 msgid "Could not update list of delegates."
 msgstr "Није могуће освежити листу делегата."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Није могуће додати делегата %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 msgid "Error reading delegates list."
 msgstr "Грешка при читању листе делегата."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Аутор (чита, прави)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
@@ -15655,20 +15745,12 @@ msgstr "Ко_нтакти: "
 msgid "Delegates"
 msgstr "Делегати"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "Уређивач (чита, прави, уређује)"
-
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "Овлашћења за"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "Рецензент (само чита)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15686,8 +15768,13 @@ msgstr "_Делегати могу да виде личне предмете"
 msgid "_Inbox:"
 msgstr "_Сандуче:"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+#, fuzzy
+msgid "_Summarize permissions"
+msgstr "Делегирај овлашћења"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "За_дужења:"
 
@@ -15716,23 +15803,71 @@ msgid "Exchange Folder Tree"
 msgstr "Стабло Exchange фасцикли"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "Одјави фасциклу..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Заиста се одјавити са фасцикле „%s“"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Одјави се са фасцикле „%s“"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Тренутно, Ваш статус је „Нисам у канцеларији“. </b>\n"
+"\n"
+"Желите ли да промените статус у „У канцеларији“? "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Порука када нисте у канцеларији:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Статус:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>Доле изабрана порука ће бити аутоматски послата свакој особи која Вам "
+"пошаље\n"
+"пошту док нисте у канцеларији.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Тренутно сам у канцеларији"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Тренутно нисам у канцеларији"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Не, не мењај стање"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Помоћник није у кацеларији"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Да, промени статус"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "Упозорење о истеку лозинке..."
@@ -15815,10 +15950,6 @@ msgstr "Предмети за читање"
 msgid "Role: "
 msgstr "Улога: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Не, не мењај стање"
-
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
 msgstr "<b>Подешавања поруке</b>"
@@ -15866,14 +15997,28 @@ msgid "Request a _read receipt for this message"
 msgstr "Захтевај _признаницу  да је прочитана за ову поруку"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+#, fuzzy
+msgid "Send as Delegate"
+msgstr "Унеси делегата"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "_Осетљивост: "
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+#, fuzzy
+msgid "_User"
+msgstr "_Корисник:"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "Изаберите корисника"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 msgid "Address Book..."
 msgstr "Именик..."
 
@@ -16028,7 +16173,7 @@ msgid "Folder offline"
 msgstr "Фасцикла није на мрежи"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1280
 msgid "Generic error"
 msgstr "Општа грешка"
 
@@ -16078,35 +16223,39 @@ msgid "Password successfully changed."
 msgstr "Лозинка је успешно промењена."
 
 #: ../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 ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Молим будите сигурни да је име Глобалног сервера за каталог тачно."
 
 # shell:noshell-reason title
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Поново покрените Еволуцију да би промене наступиле"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please select a user."
 msgstr "Изаберите корисника."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr "Сервер је одбио лозинку јер је преслаба."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange налог ће бити искључен када изађете из Еволуције"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange налог ће бити уклољен када изађете из Еволуције"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange сервер није компатибилан са Exchange Connector-ом."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16114,7 +16263,7 @@ msgstr ""
 "Сервер има покренут Exchange 5.5. Exchange Connector \n"
 "подржава само Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16128,52 +16277,58 @@ msgstr ""
 "\n"
 "Или сте можда само погрешно укуцали лозинку."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr "Покушајте поново другом лозинком."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to add user to access control list:"
 msgstr "Није могућа додати корисника на листу за контролу приступа:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to edit delegates."
 msgstr "Није могуће уређивање делегата."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unknown error looking up {0}"
 msgstr "Непозната грешка у проналажењу {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error."
 msgstr "Непозната грешка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown type"
 msgstr "Непознат тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unsupported operation"
 msgstr "Операција није подржана"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Приближавате се вашој квоти коју имате за смештање поште на овом серверу."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
 msgstr "Не можете да себе делегирате"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Прекорачили сте квоту за смештај поште на овом серверу."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr "Можете само да подесите један Exchange налог."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16181,7 +16336,7 @@ msgstr ""
 "Тренутна искоришћеност је: {0} KB. Пробајте да ослободите простор брисањем "
 "неких порука."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16189,7 +16344,7 @@ msgstr ""
 "Тренутна искоришћеност је: {0} KB. Од овог тренутка нећете моћи ни да шаљете "
 "ни да примате пошту."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16197,19 +16352,19 @@ msgstr ""
 "Тренутна искоришћеност је: {0} KB. Нећете моћи да шаљете пошту док не "
 "ослободите простор брисањем неких порука."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr "Лозинка је истекла."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не може бити додат на листу за контролу приступа"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} is already a delegate"
 msgstr "{0} је већ делегат"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already in the list"
 msgstr "{0} је већ не листи"
 
@@ -16239,7 +16394,7 @@ msgstr "Одјави фасцикле"
 msgid "_Unsubscribe"
 msgstr "_Одјави се"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:434
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:428
 msgid "Checklist"
 msgstr "Списак"
 
@@ -16495,36 +16650,64 @@ msgstr "Додај "
 msgid "Modify"
 msgstr "Измени"
 
-#: ../plugins/groupwise-features/status-track.c:118
+#: ../plugins/groupwise-features/status-track.c:103
 msgid "Message Status"
 msgstr "Статус поруке"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:132
+#: ../plugins/groupwise-features/status-track.c:117
 msgid "<b>Subject</b> :"
 msgstr "<b>Наслов</b>"
 
-#: ../plugins/groupwise-features/status-track.c:144
+#: ../plugins/groupwise-features/status-track.c:129
 msgid "<b>From</b> :"
 msgstr "<b>Шаље</b>"
 
-#: ../plugins/groupwise-features/status-track.c:157
+#: ../plugins/groupwise-features/status-track.c:142
 msgid "<b>Creation date</b> :"
 msgstr "<b>Датум прављења</b>"
 
-#: ../plugins/groupwise-features/status-track.c:177
-msgid "<b>Recipients </b>"
-msgstr "<b>Примаоци</b>"
-
-#: ../plugins/groupwise-features/status-track.c:181
-msgid "<b>Action</b>"
-msgstr "<b>Радња</b>"
+#: ../plugins/groupwise-features/status-track.c:178
+#, fuzzy
+msgid "Recipient: "
+msgstr "Примаоци"
 
 #: ../plugins/groupwise-features/status-track.c:185
-msgid "<b>Date and Time</b>"
-msgstr "<b>Датум и време</b>"
+#, fuzzy
+msgid "Delivered: "
+msgstr "_Испоручено"
+
+#: ../plugins/groupwise-features/status-track.c:191
+#, fuzzy
+msgid "Opened: "
+msgstr "Отвори"
+
+#: ../plugins/groupwise-features/status-track.c:196
+#, fuzzy
+msgid "Accepted: "
+msgstr "Прихваћено"
+
+#: ../plugins/groupwise-features/status-track.c:201
+#, fuzzy
+msgid "Deleted: "
+msgstr "Обрисано"
+
+#: ../plugins/groupwise-features/status-track.c:206
+#, fuzzy
+msgid "Declined: "
+msgstr "Одбијено"
+
+#: ../plugins/groupwise-features/status-track.c:211
+#, fuzzy
+msgid "Completed: "
+msgstr "Завршено "
+
+#: ../plugins/groupwise-features/status-track.c:216
+#, fuzzy
+msgid "Un-delivered: "
+msgstr "_Испоручено"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Прати статус поруке..."
 
@@ -16536,15 +16719,15 @@ msgstr "Додатак за намештање Хулиних извора ка�
 msgid "Hula Account Setup"
 msgstr "Подешавање Хула налога"
 
-#: ../plugins/imap-features/imap-headers.c:133
+#: ../plugins/imap-features/imap-headers.c:134
 msgid "Custom Header"
 msgstr "Прилагођено заглавље"
 
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:256
 msgid "Custom Headers"
 msgstr "Прилагођена заглавља"
 
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:266
 msgid "IMAP Headers"
 msgstr "IMAP заглавља"
 
@@ -16553,7 +16736,8 @@ msgid "<b>Custom Headers</b>"
 msgstr "<b>Прилагођена заглавља</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
+#, fuzzy
+msgid "<b>IMAP Headers</b>"
 msgstr "<b>IMAP заглавља</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
@@ -16606,20 +16790,20 @@ msgstr "Извез_и у календар"
 msgid "_Import to Tasks"
 msgstr "Увези у _задужења"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:203
+#: ../plugins/import-ics-attachments/icsimporter.c:206
 msgid "Import ICS"
 msgstr "Увези Интернет календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:231
+#: ../plugins/import-ics-attachments/icsimporter.c:233
 msgid "Select Task List"
 msgstr "Изаберит_е списак задужења"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:235
+#: ../plugins/import-ics-attachments/icsimporter.c:237
 msgid "Select Calendar"
 msgstr "Изаберите календар"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:266
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "У_воз"
 
@@ -16632,11 +16816,12 @@ msgstr "Увези у календар"
 msgid "Imports ICS attachments to calendar."
 msgstr "Увози ICS прилоге у календар."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:64
+#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for a iPod failed</span>\n"
+"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
 "\n"
-"Evolution could not find a iPod to synchronize with.Either it is not "
+"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\">Трагање за iPod неуспешно</span>\n"
@@ -16662,154 +16847,117 @@ msgstr "Усклади са iPod џепним уређајем"
 msgid "iPod Synchronization"
 msgstr "_Усклађивање са iPod џепним уређајем"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Нема излазне/крајње фасцикле!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"Излазна фасцикла није пронађена на iPod уређају! Молим проверите да ли је "
-"џепни уређај правилно подешен и покушајте поново."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Није могућ извоз података!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Неуспешан извоз података."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Није могуће отворити именик!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Не могу да отворим Еволуцијин именик како би извезао податке."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Не могу отворити календар/списак обавеза"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Не могу отворити Еволуцијин календар/списак за урадити да би извезао податке."
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:427
+#: ../plugins/itip-formatter/itip-formatter.c:548
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Није могуће отварање календара „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Један заказани састанак у календару „%s“ је у исто време кад и овај сусрет"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:594
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Заказани састанак је пронађен у календару „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:670
 msgid "Unable to find any calendars"
 msgstr "Не могу да пронађем ниједан календар"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:677
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не могу пронаћи овај сусрет у ниједном календару"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:681
 msgid "Unable to find this task in any task list"
 msgstr "Не могу пронаћи ово задужење у ниједном списку задужења"
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
+#: ../plugins/itip-formatter/itip-formatter.c:685
 msgid "Unable to find this journal entry in any journal"
 msgstr "Не могу да пронађем овај унос у ниједном дневнику"
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:758
 msgid "Searching for an existing version of this appointment"
 msgstr "Претрага једне постојеће верзије овог састанка је у току"
 
-#: ../plugins/itip-formatter/itip-formatter.c:801
+#: ../plugins/itip-formatter/itip-formatter.c:921
 msgid "Unable to parse item"
 msgstr "Није могућа обрада предмета"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:979
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Није могуће слање предмета календару ’%s‘.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:871
+#: ../plugins/itip-formatter/itip-formatter.c:991
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Послато календару ’%s‘ као прихваћено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:995
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Послато календару ’%s‘ уз резерву"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1000
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Послато календару ’%s‘ као одбијено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1005
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Послато календару „%s“ као отказано"
 
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1099
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор је уклонио делегата %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1106
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Делегату је послато обавештење о отказивању"
 
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1108
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Није могуће послати обавештење о отказивању делегату"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1193
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Стање учесника није освежено због неисправног стања"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1220
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Није могуће освежавање за учесника. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1224
 msgid "Attendee status updated"
 msgstr "Стање учесника је освежено"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1351
 msgid "The calendar attached is not valid"
 msgstr "Приложен календар није исправан"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1352
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Порука пријављује календар, али тај календар није исправан иКалендар."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1387
+#: ../plugins/itip-formatter/itip-formatter.c:1405
+#: ../plugins/itip-formatter/itip-formatter.c:1486
 msgid "The item in the calendar is not valid"
 msgstr "Предмет у календару није исправан"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/itip-formatter/itip-formatter.c:1406
+#: ../plugins/itip-formatter/itip-formatter.c:1487
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16817,11 +16965,11 @@ msgstr ""
 "Порука садржи календар, али он не садржи догађаје, задужења или слободно/"
 "заузето податке."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "The calendar attached contains multiple items"
 msgstr "Календар у прилогу садржи више предмета"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1418
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16831,76 +16979,76 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2244
 msgid "_Delete message after acting"
 msgstr "_Обриши поруку након радње"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2254
+#: ../plugins/itip-formatter/itip-formatter.c:2286
 msgid "Conflict Search"
 msgstr "Табела претраге за преклапањима"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2269
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Бира календаре за претрагу преклапања у састанцима"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "Данас"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Данас %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Данас %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Данас %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Сутра"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Сутра %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Сутра %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Сутра %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Сутра %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:254
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -16910,69 +17058,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:280
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -16982,129 +17130,168 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> преко %s објави следећи податак о састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> објави следећи податак о састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> Вам делегира следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> преко %s захтева Ваше присуство на следећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> захтева Ваше присуство на следећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> преко %s жели да дода постојећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> жели да дода постојећем састанку:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:380
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> жели да прими најновији податак за следећи састанак:"
+
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> жели да прими најновији податак за следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> посла следећи одговор за састанак:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> посла следећи одговор за састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> преко %s отказа следећи састанак:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> отказа следећи састанак."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> предложи следеће промене састанка."
+
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> предложи следеће промене састанка."
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> преко %s одби следеће промене састанка:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> одби следеће промене састанка."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> преко %s објави следеће задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> објави следеће задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> захтева да %s преузме следеће задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> преко %s Вам додели задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> Вам додели задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b преко %s жели да дода постојећем задужењу:"
 
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b жели да дода постојећем задужењу:"
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:468
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+"<b>%s</b> жели да добије најновије информације за следеће додељено задужење:"
+
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -17112,149 +17299,168 @@ msgid ""
 msgstr ""
 "<b>%s</b> жели да добије најновије информације за следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> посла назад следећи одговор на додељено задужење:"
+
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> посла назад следећи одговор на додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> преко %s отказа следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> отказа следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> предложи следеће промене у додели задужења:"
+
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> предложи следеће промене у додели задужења:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> преко %s одби следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> одби следеће додељено задужење:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> преко %s објави следећу белешку:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> објави следећу белешку:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> преко %s жели да дода постојећој белешци:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> жели да дода постојећој белешци:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> преко %s отказа следећу дељену белешку:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> отказа следеће дељену белешку:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:815
 msgid "_Open Calendar"
 msgstr "_Отвори календар"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:822
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:855
 msgid "_Accept"
 msgstr "При_хвати"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:825
 msgid "_Decline all"
 msgstr "Од_биј све"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:826
 msgid "_Tentative all"
 msgstr "Све са ре_зервом"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative"
 msgstr "Са _резервом"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Accept all"
 msgstr "П_рихвати све"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Send Information"
 msgstr "Пошаљи подат_ке"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Update Attendee Status"
 msgstr "Освежи стање учесни_ка"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update"
 msgstr "Ос_вежи"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:1006
 msgid "Start time:"
 msgstr "Време почетка:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:1015
 msgid "End time:"
 msgstr "Време завршетка:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1081
 msgid "Comment:"
 msgstr "Напомена:"
 
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1067
+#, fuzzy
+msgid "Send _reply to sender"
+msgstr "_Одговори пошиљаоцу"
+
+#: ../plugins/itip-formatter/itip-view.c:1095
+#, fuzzy
+msgid "Send _updates to attendees"
 msgstr "Пошаљи о_свежене податке учесницима"
 
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1104
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "При_мени на све структуре"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1835
 msgid "_Tasks :"
 msgstr "За_дужења:"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1837
 msgid "Memos :"
 msgstr "Белешке :"
 
@@ -17295,6 +17501,46 @@ msgstr "Дозвољава искључивање налога."
 msgid "Disable Account"
 msgstr "Искључи налог"
 
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Enable libnotify notifications of new mail"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Every time a new mail arrives, pop up a libnotify notification."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Make the status icon blink"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "When the new-mail status icon is visible, make it blink."
+msgstr ""
+
+#: ../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] ""
+
+#: ../plugins/mail-notification/mail-notification.c:153
+#, fuzzy
+msgid "New email"
+msgstr "Нова белешка"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Обавештење о новој пошти"
+
+#: ../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."
+msgstr ""
+
 #: ../plugins/mail-remote/client.c:30
 #, c-format
 msgid "System error: %s"
@@ -17565,17 +17811,13 @@ msgstr "Обавести D-BUS поруком када стигне нова п�
 msgid "New Mail Notification"
 msgstr "Обавештење о новој пошти"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Обавештење о новој пошти"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Додатак за укључивање и искључивање других додатака."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:202
 msgid "Plugin Manager"
 msgstr "Управљач додацима"
 
@@ -17587,22 +17829,22 @@ msgstr "Укључује и искључује додатке"
 msgid "_Plugins"
 msgstr "До_даци"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:53
 msgid "Author(s)"
 msgstr "Аутор(и)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/plugin-manager/plugin-manager.c:54
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Опис"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:215
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Напомена: неке измене неће бити укључене пре поновног покретања"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:268
+#: ../plugins/plugin-manager/plugin-manager.c:327
 msgid "Plugin"
 msgstr "Додатак"
 
@@ -17647,6 +17889,10 @@ msgstr "HTML модел"
 msgid "Gives an option to print mail from composer"
 msgstr "Даје могућност штампе поруке из састављача"
 
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "Штампај поруку"
+
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
@@ -17742,10 +17988,22 @@ msgstr "_Врста услуге:"
 msgid "_File:"
 msgstr "Дато_тека:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Лозинка:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "О_бјави као:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Запамти лозинку"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "_Корисничко име:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17754,20 +18012,32 @@ msgstr ""
 "иКал\n"
 "Слободно/заузето"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#, fuzzy
+msgid "SpamAssassin (built-in)"
 msgstr "Спам убица (уграђен)"
 
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+#, fuzzy
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "<small>Ово ће учинити филтер поузданијим, али споријим</small>"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+msgid "I_nclude remote tests"
+msgstr "У_кључи мрежне провере"
+
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+#, fuzzy
 msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
 msgstr ""
 "Пропушта нежељене поруке под сатару Убице нежељене поште и овај додатак "
 "захтева тај програм."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
+#, fuzzy
+msgid "SpamAssassin junk plugin"
 msgstr "Убица нежељене поште (додатак)"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
@@ -17776,7 +18046,7 @@ msgstr "Додатак за чување свих прилога или дело
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:334
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "Сачувај прилоге"
 
@@ -17788,16 +18058,16 @@ msgstr "Сачувај прилоге..."
 msgid "Save all attachments"
 msgstr "Сачувај све прилоге"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
 msgid "Select save base name"
 msgstr "Изабери име за снимање базе"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:20
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "Сачувај"
 
@@ -17935,15 +18205,15 @@ msgstr "Додатак који рукује уводним чаробњаком
 msgid "Startup wizard"
 msgstr "Чаробњак за почетак"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Помоћник Еволуција подешавања"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Добро дошли"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -17956,26 +18226,31 @@ msgstr ""
 "\n"
 "Кликните „Напред“ да наставите. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:134
 msgid "Importing files"
 msgstr "Увожење датотека"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Изаберите податке које желите да увезете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
 msgid "Importing data."
 msgstr "Увожење података."
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "Сачекајте"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "Обавештава ако низање порука треба да се врати на наслов."
@@ -18009,60 +18284,60 @@ msgstr "Проба Еволуције"
 msgid "Evolution Test component"
 msgstr "Пробни део Еволуције"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "A string description of the current printer settings"
 msgstr "Описни низ тренутних подешавања штампача"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "Верзија подешавања"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Default sidebar width"
 msgstr "Подразумевана ширина бочне траке"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default window height"
 msgstr "Подразумевана висина прозора"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window state"
 msgstr "Подразумевано стање прозора"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window width"
 msgstr "Подразумевана ширина прозора"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ИБ или алијас дела који се подразумевано приказује по покретању."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Последња надограђена верзија подешавања"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Листа путања фасцикли за усклађивање на диску за рад ван мреже"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Sidebar is visible"
 msgstr "Бочна област је видљива"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Прескочи прозорче са упозорењем о развоју"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:472
+#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
 msgid "Start in offline mode"
 msgstr "Почни рад ван мреже"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "Statusbar is visible"
 msgstr "Линија са стањем је видљива"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18070,19 +18345,19 @@ msgstr ""
 "Верзија подешавања Еволуције, са главним/споредним/нивоом подешавања — нпр. "
 "„2.6.0“."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Подразумевана висина прозора за поруку, у пикселима."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Подразумевана ширина главног прозора, у пикселима."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Подразумевана ширина помоћне линије, у пикселима."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18090,7 +18365,7 @@ msgstr ""
 "Последња надограђена верзија подешавања Еволуције, са главним/споредним/"
 "нивоом подешавања (нпр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18100,46 +18375,46 @@ msgstr ""
 "Ако је постављено „палета алата“, Гномово подешавање палете алата утврђује "
 "стил дугмади."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Toolbar is visible"
 msgstr "Палета алата је видљива"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Да ли ће се Еволуција покренути у режиму за рад ван мреже."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Да ли да прозор буде увећан до краја."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Да ли да бочна површ буде видљива."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Да ли да статусна линија буде видљива."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether the toolbar should be visible."
 msgstr "Да ли да палета алата буде видљива."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Да ли ће прозорче са упозорењем у развојним верзијама Еволуције бити "
 "приказано."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the window buttons should be visible."
 msgstr "Да ли да дугмад прозора буду видљива."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Window button style"
 msgstr "Стил дугмади прозора"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Window buttons are visible"
 msgstr "Дугмад прозора су видљива"
 
@@ -18155,16 +18430,11 @@ msgstr "Успостављене везе"
 msgid "Click OK to close these connections and go offline"
 msgstr "Кликните У реду да прекинете везу и радите ван мреже"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(Неименовано)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Изаберите тип увозника:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18178,11 +18448,11 @@ msgstr ""
 "Можете изабрати „Аутоматско“ уколико не знате, и Еволуција ће покушати да "
 "сама заврши посао."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Изаберите одредиште за овај увоз"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18194,27 +18464,27 @@ msgstr ""
 "која би се могла увести. Уколико желите да покушате\n"
 "поново, кликните на дугме „Назад“.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Име датотеке:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Тип датотеке:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Увези податке и подешавања из _старијих програма"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Увези _једну датотеку"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:319
 msgid "Evolution Preferences"
 msgstr "Еволуцијине поставке"
 
@@ -18238,27 +18508,27 @@ msgstr "Име фасцикле не може да садржи знак „#“
 msgid "'.' and '..' are reserved folder names."
 msgstr "’.‘ и ’..‘ су заузети за имена фасцикли."
 
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Изгледа да овај систем нема инсталиране Гном пилот алате."
 
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка при покретању %s."
 
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "Бубаждајин помоћник није инсталиран."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "Бубаждајин помоћник не може бити покренут."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:565
+#: ../shell/e-shell-window-commands.c:584
 msgid "translator-credits"
 msgstr ""
 "Игор Несторовић <igor@prevod.org>\n"
@@ -18266,19 +18536,19 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../shell/e-shell-window-commands.c:576
+#: ../shell/e-shell-window-commands.c:595
 msgid "Evolution Website"
 msgstr "Веб страница Еволуције"
 
-#: ../shell/e-shell-window-commands.c:782
+#: ../shell/e-shell-window-commands.c:803
 msgid "_Work Online"
 msgstr "_Рад на мрежи"
 
-#: ../shell/e-shell-window-commands.c:795 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:816 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ра_д ван мреже"
 
-#: ../shell/e-shell-window-commands.c:808
+#: ../shell/e-shell-window-commands.c:829
 msgid "Work Offline"
 msgstr "Рад ван мреже"
 
@@ -18295,33 +18565,33 @@ msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Еволуција тренутно није на мрежи. Притисните ово дугме за рад на мрежи."
 
-#: ../shell/e-shell-window.c:796
+#: ../shell/e-shell-window.c:820
 #, c-format
 msgid "Switch to %s"
 msgstr "Пређи на %s"
 
-#: ../shell/e-shell.c:635
+#: ../shell/e-shell.c:637
 msgid "Uknown system error."
 msgstr "Непозната системска грешка."
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:833 ../shell/e-shell.c:834
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1263 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1272 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "У реду"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1274
 msgid "Invalid arguments"
 msgstr "Неисправни аргументи"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1276
 msgid "Cannot register on OAF"
 msgstr "Није могућа регистрација на OAF"
 
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1278
 msgid "Configuration Database not found"
 msgstr "База са подешавањима није нађена"
 
@@ -18331,15 +18601,15 @@ msgstr "База са подешавањима није нађена"
 msgid "New"
 msgstr "Ново"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:107
 msgid "New Test"
 msgstr "Нова проба"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:108
 msgid "_Test"
 msgstr "_Проба"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Направи нови пробни предмет"
 
@@ -18382,7 +18652,7 @@ msgstr ""
 "увоза спољних датотека у Еволуцију."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:219
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18417,7 +18687,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо Ваш допринос!\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:243
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18425,39 +18695,39 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:250
 msgid "Do not tell me again"
 msgstr "Немој ми поново рећи"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:456
 msgid "Start Evolution activating the specified component"
 msgstr "Покрени Еволуцију уз наведени део"
 
-#: ../shell/main.c:474
+#: ../shell/main.c:460
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:463
 msgid "Forcibly shut down all Evolution components"
 msgstr "Силом гаси све делове Еволуције"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:467
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Приморај понован пренос података из Еволуције 1.4"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:470
 msgid "Send the debugging output of all components to a file."
 msgstr "Пошаљи излаз о грешкама из свих делова у датотеку."
 
-#: ../shell/main.c:486
+#: ../shell/main.c:472
 msgid "Disable loading of any plugins."
 msgstr "Искључује учитавање свих додатака."
 
-#: ../shell/main.c:516
+#: ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "Еволуција - Лични уредник података и програм за е-пошту"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:514
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18631,39 +18901,61 @@ msgstr ""
 "Пошто не верујете издаваоцу овог сертификата, онда не верујете ни у "
 "аутентичност овог сертификата осим ако овде не назначите другачије"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:138
+#: ../smime/gui/certificate-manager.c:156
+#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:407
+#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:639
 msgid "Select a certificate to import..."
 msgstr "Изаберите сертификат за увоз..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:147
+#, fuzzy
+msgid "All PKCS12 files"
+msgstr "PKCS12 лозинка датотеке"
+
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:403
+#: ../smime/gui/certificate-manager.c:635
+#, fuzzy
+msgid "All files"
+msgstr "Све локалнефасцикле"
+
+#: ../smime/gui/certificate-manager.c:279
+#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:726
 msgid "Certificate Name"
 msgstr "Име сертификата"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:288
+#: ../smime/gui/certificate-manager.c:514
 msgid "Purposes"
 msgstr "Намене"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Серијски број"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:305
 msgid "Expires"
 msgstr "Истиче"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:398
+#, fuzzy
+msgid "All email certificate files"
+msgstr "Издавач сертификата е-поште"
+
+#: ../smime/gui/certificate-manager.c:505
 msgid "E-Mail Address"
 msgstr "Електронска адреса"
 
+#: ../smime/gui/certificate-manager.c:630
+#, fuzzy
+msgid "All CA certificate files"
+msgstr "Детаљи сертификата"
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -19067,30 +19359,6 @@ msgstr "Унесите лозинку за PKCS12 датотеку:"
 msgid "Imported Certificate"
 msgstr "Увежен сертификат"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "Прилог за додавање."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Тип садржаја прилога."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "Име датотеке које се приказује у поруци."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Опис прилога."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Означи да се прилог подразумевано приказује унутар поруке."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Подразумеван наслов поруке."
-
 # * found, so just bail completely.
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
@@ -19223,7 +19491,7 @@ msgstr "Чува изабране контакте као ВКарту."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Чува контакте изабране фасцикле као ВКарту."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2710
 msgid "Select All"
 msgstr "Изабери све"
 
@@ -19298,7 +19566,7 @@ msgstr "Премес_ти контакт у..."
 msgid "_Move Folder Contacts To"
 msgstr "_Премести контакте из фасцикле у"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Ново"
 
@@ -19500,23 +19768,23 @@ msgstr "Затвори"
 msgid "I_nsert"
 msgstr "_Уметни"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Затвори"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:44
 msgid "_File"
 msgstr "Дато_тека"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Помоћ"
 
@@ -19573,87 +19841,92 @@ msgid "R_ole Field"
 msgstr "_Улога поље"
 
 #: ../ui/evolution-event-editor.xml.h:16
+#, fuzzy
+msgid "Send _Options"
+msgstr "Опције слања"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "Прикажи време као _заузето"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Бира да ли је поље врста учесника приказано"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Бира да ли је поље RSVP приказано"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Бира да ли је поље Улога приказано"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Бира да ли да прикаже поље са стањем"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Бира да ли да прикаже временску зону"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Бира да ли да прикаже категорије"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "Бира да ли дозволити целодневне догађаје"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "Бира да ли да прикаже време као заузето"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "Ала_рми"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "Ка_тегорије"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "Озна_ка"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "Пове_рљиво"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "С_лободно/заузето:"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "Л_ично"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "Учеста_лост"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "_Стање поље"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "_Врста поље"
 
@@ -19678,79 +19951,92 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Направи или уреди правила за филтрирање нове поште"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages for Offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
+#, fuzzy
+msgid "Download messages for offline"
+msgstr "Фасцикла није на мрежи"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Фас_цикла"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Премести изабрану фасциклу у другу фасциклу"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Трајно уклони све обрисане поруке из свих фасцикли"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Search F_olders"
 msgstr "Фас_цикле претраге"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show Message _Preview"
 msgstr "Прика_жи преглед поруке"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview below the message list"
 msgstr "Прикажи преглед поруке испод листе порука"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Show message preview side-by-side with the message list"
 msgstr "Прикажи преглед поруке једно до другог са листом порука"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "Show message preview window"
 msgstr "Прикажи прозор за преглед поруке"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Пријави се или одјави на фасцикле на мрежним серверима"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Classic View"
 msgstr "_Класични приказ"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Copy Folder To..."
 msgstr "_Умножи фасциклу у..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Message Filters"
 msgstr "Ф_илтери за поруке"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:24
 msgid "_Move Folder To..."
 msgstr "_Премести фасциклу у..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_New..."
 msgstr "_Ново..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Preview"
 msgstr "_Преглед"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:30
 msgid "_Subscriptions"
 msgstr "_Пријаве"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:31
 msgid "_Vertical View"
 msgstr "_Усправни преглед"
 
@@ -19825,51 +20111,61 @@ msgid "Permanently remove this folder"
 msgstr "Трајно уклони ову фасциклу"
 
 #: ../ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Re_fresh..."
+msgstr "Освежи"
+
+#: ../ui/evolution-mail-list.xml.h:21
+#, fuzzy
+msgid "Refresh the folder"
+msgstr "Освежавање фасцикле"
+
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select Message _Thread"
 msgstr "Изабери расправу"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select _All Messages"
 msgstr "Изабери _све поруке"
 
 # bug:
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Изабери све и само поруке које тренутно нису изабране"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Означи све поруке исте расправе као изабрану поруку"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Show Hidde_n Messages"
 msgstr "При_кажи скривене поруке"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Show messages that have been temporarily hidden"
 msgstr "Прикажи поруке које су привремено скривене"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Привремено сакриј све прочитане поруке"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Temporarily hide the selected messages"
 msgstr "Привремено сакриј изабране поруке"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Threaded Message list"
 msgstr "Поруке по расправама"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "_Group By Threads"
 msgstr "Групиши по расправама"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Порука"
@@ -20172,7 +20468,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "Фасцикла претраге на дописну _листу..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
+#, fuzzy
+msgid "Search Folder from Recipien_ts..."
 msgstr "Фасцикла претраге на примаоце..."
 
 #: ../ui/evolution-mail-message.xml.h:88
@@ -20195,7 +20492,7 @@ msgstr "Изабери _сав текст"
 msgid "Select all the text in a message"
 msgstr "Изабери сав текст у поруци"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
 msgid "Set up the page settings for your current printer"
 msgstr "Подеси страну за текући штампач"
 
@@ -20415,144 +20712,169 @@ msgid "PGP Sign"
 msgstr "PGP потпис"
 
 #: ../ui/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "PGP _Encrypt"
+msgstr "PGP шифруј"
+
+#: ../ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "PGP _Sign"
+msgstr "PGP потпис"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "Захтевај извештаi_ј о достави"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "S/MIME En_crypt"
+msgstr "S/MIME шифруј"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME шифруј"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "S/MIME Sig_n"
+msgstr "S/MIME потпис"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME потпис"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "S_end"
+msgstr "Пошаљи"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "Сачувај као"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "Сачувај припрему"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "Сачувај _као..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "Сачувај _припрему"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "Сачувај као припрему"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "Сачувај у фасциклу..."
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "Сачувај тренутну датотеку"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "Сачувај тренутну датотеку под другим именом"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "Сачувај поруку у наведеној фасцикли"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "Пошаљи"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Пошаљи поруку у HTML формату"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "Пошаљи ову поруку"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "Постави важност поруке на високо"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "Потпиши ову поруку помоћу PGP кључа"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потпиши ову поруку S/MIME сертификатом"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Бира да ли је поље BCC приказано"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "Бира да ли је поље CC приказано"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Бира да ли је поље Шаље приказано"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Бира да ли је поље Пошаљи приказано"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор приказано"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "Бира да ли је поље Прима приказано"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "_Bcc поље"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "_Cc поље"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "Обри_ши све"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "Ш_аље поље"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "_Пошаљи поље"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "В_ажности поруке"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "Одго_вор поље"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "_Сигурност"
 
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "Мог_ућности код слања"
 
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "_Прима поље"
 
@@ -20741,42 +21063,47 @@ msgid "New _Window"
 msgstr "Нов п_розор"
 
 #: ../ui/evolution.xml.h:19
+#, fuzzy
+msgid "Page Set_up..."
+msgstr "Подешавање стране:"
+
+#: ../ui/evolution.xml.h:20
 msgid "Prefere_nces"
 msgstr "Постав_ке"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send / Receive"
 msgstr "Слање / примање"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Send / _Receive"
 msgstr "Слање / п_римање"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Send queued items and retrieve new items"
 msgstr "Шаље припремљене и довлачи нове предмете"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Set up Pilot configuration"
 msgstr "Подешавање Пилота"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
 msgid "Show Side _Bar"
 msgstr "Прикажи бочну о_бласт"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:27
 msgid "Show _Status Bar"
 msgstr "Прикажи _линија са стањем"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
 msgid "Show _Toolbar"
 msgstr "Прикажи _палету алата"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
 msgid "Show information about Evolution"
 msgstr "Приказује податке о Еволуцији"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
 msgid "Submit Bug Report"
 msgstr "Шаље извештај о грешци"
 
@@ -20784,71 +21111,71 @@ msgstr "Шаље извештај о грешци"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Пошаљи извештај о _грешци"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Пошаљи извештај о грешци Бубаждајиним помоћником"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Бира да ли ћемо радити ван мреже."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:38
 msgid "Tool_bar style"
 msgstr "Стил па_лете алата"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:39
 msgid "View/Hide the Side Bar"
 msgstr "Прикажи/Сакриј бочну област"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:40
 msgid "View/Hide the Status Bar"
 msgstr "Прикажи/Сакриј линију стања"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:41
 msgid "_About"
 msgstr "_О програму"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:42
 msgid "_Close Window"
 msgstr "_Затвори прозор"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:45
 msgid "_Forget Passwords"
 msgstr "Заборави _лозинке"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:47
 msgid "_Hide buttons"
 msgstr "_Сакриј дугмад"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:48
 msgid "_Icons only"
 msgstr "Само _иконе"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Кратки подсетник"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Изглед _пребацивача"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Могућности за _усклађивање..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:54
 msgid "_Text only"
 msgstr "Само _текст"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "Про_зор"
 
@@ -20931,11 +21258,11 @@ msgstr "Са _стањем"
 # Универзално време, или УТ
 # Ваљда УВ?
 #. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
@@ -20964,19 +21291,19 @@ msgstr ""
 "Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
 "Користите десни тастер миша за умањивање."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:84
 #: ../widgets/menus/gal-define-views-model.c:188
 msgid "Collection"
 msgstr "Збирка"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Одреди прегледе за %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:374
+#: ../widgets/menus/gal-define-views-dialog.c:376
 msgid "Define Views"
 msgstr "Одреди прегледе"
 
@@ -20985,12 +21312,8 @@ msgstr "Одреди прегледе"
 msgid "Define Views for \"%s\""
 msgstr "Одреди прегледе за „%s“"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "_Уреди..."
-
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1909
+#: ../widgets/table/e-table-header-item.c:1912
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -21015,7 +21338,7 @@ msgstr "_Замени постојећи преглед"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "Прилагођен преглед"
 
@@ -21024,7 +21347,7 @@ msgid "Save Custom View"
 msgstr "Чува прилагођен преглед"
 
 #: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "Одреди прегледе..."
 
@@ -21032,10 +21355,29 @@ msgstr "Одреди прегледе..."
 msgid "C_urrent View"
 msgstr "Т_ренутни преглед"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, fuzzy, c-format
+msgid "Select View: %s"
+msgstr "Недељни преглед: %s. %s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Сачувај прилагођен преглед..."
 
+#: ../widgets/menus/gal-view-menus.c:369
+#, fuzzy
+msgid "Save current custom view"
+msgstr "Сачувај тренутни преглед"
+
+#: ../widgets/menus/gal-view-menus.c:383
+#, fuzzy
+msgid "Create or edit views"
+msgstr "_Направи нови преглед"
+
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
 msgstr "Производња"
@@ -21056,6 +21398,33 @@ msgstr "Тип прегледа"
 msgid "Type of view:"
 msgstr "Тип прегледа:"
 
+#: ../widgets/misc/e-attachment-bar.c:1019
+msgid "Attachment Bar"
+msgstr "Линија прилога"
+
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Није могуће прилагање датотеке %s: %s"
+
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Није могуће прилагање датотеке %s: није регуларна датотека"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Особине прилога"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Име датотеке:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME тип:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "Предложи аутоматски приказ прилога"
@@ -21068,8 +21437,8 @@ msgid "MTWTFSS"
 msgstr "ПУСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1089
-#: ../widgets/misc/e-calendar-item.c:1743
+#: ../widgets/misc/e-calendar-item.c:1088
+#: ../widgets/misc/e-calendar-item.c:1742
 msgid "%B %Y"
 msgstr "%B %Y."
 
@@ -21078,27 +21447,27 @@ msgid "Month Calendar"
 msgstr "Месечни календар"
 
 #: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../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
 msgid "Fill color"
 msgstr "Боја испуњавања"
 
 #: ../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:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../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
 msgid "GDK fill color"
 msgstr "GDK боја испуњавања"
 
 #: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../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
 msgid "Fill stipple"
 msgstr "Истачкај"
 
@@ -21141,115 +21510,116 @@ msgstr "Најмања ширина"
 msgid "Spacing"
 msgstr "Размак"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "Сада"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Време мора бити у формату: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Вредност постотка мора бити између 0 и 100"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "Балтичка"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "Централноевропска"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "Кинеска"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "Ћирилична"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "Грчка"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "Хебрејска"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "Јапанска"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "Корејска"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "Тајвански"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "Турска"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "Уникод"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "Западноевропска"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "Западноевропска, нова"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "Традиционална"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
 #: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Simplified"
 msgstr "Поједностављена"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "Украјинска"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "Визуелна"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Непозната кодна страна: %s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "Кодна страна"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "Изаберите кодну страну за коришћење"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "Друго..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
 #: ../widgets/misc/e-dateedit.c:321
 msgid "Date and Time"
 msgstr "Датум и време"
@@ -21271,36 +21641,19 @@ msgstr "Оквир за избор времена"
 msgid "Time"
 msgstr "Време"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:459
 msgid "No_w"
 msgstr "_Сада"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:465
 msgid "_Today"
 msgstr "_Данас"
 
-# strftime format of a time in 24-hour format,
-# without seconds.
-# This is a strftime() format. %H = hour (0-23), %M = minute.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-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.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: ../widgets/misc/e-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1631
 msgid "Invalid Date Value"
 msgstr "Неисправан датум"
 
-#: ../widgets/misc/e-dateedit.c:1660
+#: ../widgets/misc/e-dateedit.c:1657
 msgid "Invalid Time Value"
 msgstr "Неисправно време"
 
@@ -21340,11 +21693,11 @@ msgstr "Елемент ознаке"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Елемент који се приказује уместо обичне ознаке стабла"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3359
 msgid "Expander Size"
 msgstr "Величина стабла"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3360
 msgid "Size of the expander arrow"
 msgstr "Величина стрелице стабла"
 
@@ -21357,21 +21710,21 @@ msgid "Spacing around expander arrow"
 msgstr "Размак око стрелице стабла"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:291 ../widgets/misc/e-filter-bar.c:727
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
+#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:233
 msgid "Save Search"
 msgstr "Сачувај претрагу"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:270
 msgid "_Searches"
 msgstr "_Претраге"
 
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:272
 msgid "Searches"
 msgstr "Претраге"
 
@@ -21387,31 +21740,35 @@ msgstr "_Уреди сачуване претраге..."
 msgid "_Advanced Search..."
 msgstr "_Напредна претрага..."
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
-msgstr "Сви налози"
+msgstr "свим налозима"
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
-msgstr "Текући налог"
+msgstr "текућем налогу"
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
-msgstr "Текућа фасцикла"
+msgstr "текућој фасцикли"
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Message"
-msgstr "Текућа порука"
+msgstr "текућој поруци"
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Изаберите слику"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Карта света"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -21443,43 +21800,43 @@ msgstr "Модел преиспуњавања"
 msgid "Column width"
 msgstr "Ширина колоне"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:596
 msgid "_Search"
 msgstr "_Претражи"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:602
 msgid "_Find Now"
 msgstr "Про_нађи сада"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Clear"
 msgstr "_Очисти"
 
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Item ID"
 msgstr "ИБ предмета"
 
-#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1223
-#: ../widgets/text/e-entry.c:1224 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../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
 msgid "Text"
 msgstr "Текст"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:996
+#: ../widgets/misc/e-search-bar.c:999
 msgid "Sho_w: "
 msgstr "Прика_жи: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1016
 msgid "Sear_ch: "
 msgstr "П_ретражи"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1025
+#: ../widgets/misc/e-search-bar.c:1028
 msgid " i_n "
 msgstr " _у "
 
@@ -21639,14 +21996,14 @@ msgid "_When opened:"
 msgstr "_Када је отворено:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:219
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
@@ -21679,35 +22036,35 @@ msgstr "искачућа листа"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:398
+#: ../widgets/table/e-cell-pixbuf.c:387
 msgid "Selected Column"
 msgstr "Изабрана колона"
 
-#: ../widgets/table/e-cell-pixbuf.c:405
+#: ../widgets/table/e-cell-pixbuf.c:394
 msgid "Focused Column"
 msgstr "Фокусирана колона"
 
-#: ../widgets/table/e-cell-pixbuf.c:412
+#: ../widgets/table/e-cell-pixbuf.c:401
 msgid "Unselected Column"
 msgstr "Неизабрана колона"
 
-#: ../widgets/table/e-cell-text.c:1805
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Strikeout Column"
 msgstr "Прецртана колона"
 
-#: ../widgets/table/e-cell-text.c:1812
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Underline Column"
 msgstr "Подвучена колона"
 
-#: ../widgets/table/e-cell-text.c:1819
+#: ../widgets/table/e-cell-text.c:1816
 msgid "Bold Column"
 msgstr "Подебљана колона"
 
-#: ../widgets/table/e-cell-text.c:1826
+#: ../widgets/table/e-cell-text.c:1823
 msgid "Color Column"
 msgstr "Колона у боји"
 
-#: ../widgets/table/e-cell-text.c:1840
+#: ../widgets/table/e-cell-text.c:1837
 msgid "BG Color Column"
 msgstr "Колона боја у позадини"
 
@@ -21722,7 +22079,7 @@ msgstr "До_ступна поља:"
 
 #: ../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:1575
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Ascending"
 msgstr "Растуће"
 
@@ -21733,7 +22090,7 @@ msgstr "Очисти све"
 
 #: ../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:1575
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Descending"
 msgstr "Опадајуће"
 
@@ -21757,7 +22114,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "При_кажи ова поља редом:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.c:643
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Прикажи поља"
@@ -21796,27 +22153,27 @@ msgstr "Приказана _поља..."
 msgid "_Sort..."
 msgstr "_Разврстај..."
 
-#: ../widgets/table/e-table-config.c:150
+#: ../widgets/table/e-table-config.c:154
 msgid "State"
 msgstr "Стање"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Ascending)"
 msgstr "(Растуће)"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Descending)"
 msgstr "(Опадајуће)"
 
-#: ../widgets/table/e-table-config.c:314
+#: ../widgets/table/e-table-config.c:394
 msgid "Not sorted"
 msgstr "Није разврстано"
 
-#: ../widgets/table/e-table-config.c:355
+#: ../widgets/table/e-table-config.c:435
 msgid "No grouping"
 msgstr "Без груписања"
 
-#: ../widgets/table/e-table-config.c:584
+#: ../widgets/table/e-table-config.c:664
 msgid "Available Fields"
 msgstr "Доступна поља"
 
@@ -21832,14 +22189,14 @@ msgstr "_Прикажи ова поља по реду:"
 #: ../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:1874
+#: ../widgets/table/e-table-header-item.c:1877
 msgid "DnD code"
 msgstr "ПиП код"
 
 #: ../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:1888
+#: ../widgets/table/e-table-header-item.c:1891
 msgid "Full Header"
 msgstr "Пуно заглавље"
 
@@ -21888,7 +22245,7 @@ msgstr "Редови наизменичних боја"
 #: ../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:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-tree.c:3312 ../widgets/table/e-tree.c:3313
 msgid "Horizontal Draw Grid"
 msgstr "Положене линије за цртање"
 
@@ -21897,7 +22254,7 @@ msgstr "Положене линије за цртање"
 #: ../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:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-tree.c:3318 ../widgets/table/e-tree.c:3319
 msgid "Vertical Draw Grid"
 msgstr "Усправне линије за цртање"
 
@@ -21906,7 +22263,7 @@ msgstr "Усправне линије за цртање"
 #: ../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:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-tree.c:3324 ../widgets/table/e-tree.c:3325
 msgid "Draw focus"
 msgstr "Средиште цртања"
 
@@ -21931,8 +22288,8 @@ msgstr "Модел за избор"
 #: ../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:3309 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3307
 msgid "Length Threshold"
 msgstr "Највећа дужина"
 
@@ -21941,8 +22298,8 @@ msgstr "Највећа дужина"
 #: ../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:3316 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Uniform row height"
 msgstr "Уједначена висина редова"
 
@@ -21953,70 +22310,81 @@ msgstr "Уједначена висина редова"
 msgid "Frozen"
 msgstr "Замрзнуто"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1457
 msgid "Customize Current View"
 msgstr "Прилагодите тренутни преглед"
 
-#: ../widgets/table/e-table-header-item.c:1473
-msgid "Sort Ascending"
+#: ../widgets/table/e-table-header-item.c:1477
+#, fuzzy
+msgid "Sort _Ascending"
 msgstr "Растуће разврставање"
 
-#: ../widgets/table/e-table-header-item.c:1474
-msgid "Sort Descending"
+#: ../widgets/table/e-table-header-item.c:1478
+#, fuzzy
+msgid "Sort _Descending"
 msgstr "Опадајуће разврставање"
 
-#: ../widgets/table/e-table-header-item.c:1475
-msgid "Unsort"
+#: ../widgets/table/e-table-header-item.c:1479
+#, fuzzy
+msgid "_Unsort"
 msgstr "Не разврставај"
 
-#: ../widgets/table/e-table-header-item.c:1477
-msgid "Group By This Field"
+#: ../widgets/table/e-table-header-item.c:1481
+#, fuzzy
+msgid "Group By This _Field"
 msgstr "Групиши по овоме пољу"
 
-#: ../widgets/table/e-table-header-item.c:1478
-msgid "Group By Box"
+#: ../widgets/table/e-table-header-item.c:1482
+#, fuzzy
+msgid "Group By _Box"
 msgstr "Групиши по оквиру"
 
-#: ../widgets/table/e-table-header-item.c:1480
-msgid "Remove This Column"
+#: ../widgets/table/e-table-header-item.c:1484
+#, fuzzy
+msgid "Remove This _Column"
 msgstr "Уклони ову колону"
 
-#: ../widgets/table/e-table-header-item.c:1481
-msgid "Add a Column..."
+#: ../widgets/table/e-table-header-item.c:1485
+#, fuzzy
+msgid "Add a C_olumn..."
 msgstr "Додај колону..."
 
-#: ../widgets/table/e-table-header-item.c:1483
-msgid "Alignment"
+#: ../widgets/table/e-table-header-item.c:1487
+#, fuzzy
+msgid "A_lignment"
 msgstr "Поравнање"
 
-#: ../widgets/table/e-table-header-item.c:1484
-msgid "Best Fit"
+#: ../widgets/table/e-table-header-item.c:1488
+#, fuzzy
+msgid "B_est Fit"
 msgstr "Најбоље уклапање"
 
-#: ../widgets/table/e-table-header-item.c:1485
-msgid "Format Columns..."
+#: ../widgets/table/e-table-header-item.c:1489
+#, fuzzy
+msgid "Format Column_s..."
 msgstr "Форматирај колоне..."
 
-#: ../widgets/table/e-table-header-item.c:1487
-msgid "Customize Current View..."
+#: ../widgets/table/e-table-header-item.c:1491
+#, fuzzy
+msgid "Custo_mize Current View..."
 msgstr "Прилагоди тренутни преглед..."
 
-#: ../widgets/table/e-table-header-item.c:1536
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Sort By"
 msgstr "Поредај по"
 
-#: ../widgets/table/e-table-header-item.c:1881
+#: ../widgets/table/e-table-header-item.c:1884
 msgid "Font Description"
 msgstr "Опис фонта"
 
-#: ../widgets/table/e-table-header-item.c:1902
+#: ../widgets/table/e-table-header-item.c:1905
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Детаљи разврставања"
 
-#: ../widgets/table/e-table-header-item.c:1916
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1919
+#: ../widgets/table/e-tree-scrolled.c:231
+#: ../widgets/table/e-tree-scrolled.c:232
 msgid "Tree"
 msgstr "Стабло"
 
@@ -22032,159 +22400,485 @@ msgstr "Модел табеле"
 msgid "Cursor row"
 msgstr "Ред курсора"
 
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3346
 msgid "Always search"
 msgstr "Увек претражи"
 
-#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-table.c:3333
 msgid "Use click to add"
 msgstr "Користите клик да додате"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3331 ../widgets/table/e-tree.c:3332
 msgid "ETree table adapter"
 msgstr "ETree прилагођивач табеле"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3352
 msgid "Retro Look"
 msgstr "Старински изглед"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3353
 msgid "Draw lines and +/- expanders."
 msgstr "Исцртава линије и +/- граничнике."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Проба миникарте"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Ауторско право (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "Ово испробава поље миникарте"
-
-#: ../widgets/text/e-entry.c:1216 ../widgets/text/e-entry.c:1217
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
+#: ../widgets/text/e-text.c:3475 ../widgets/text/e-text.c:3476
 msgid "Event Processor"
 msgstr "Обрађивач догађаја"
 
-#: ../widgets/text/e-entry.c:1230 ../widgets/text/e-entry.c:1231
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Justification"
 msgstr "Обострано"
 
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Use ellipsis"
 msgstr "Користи три тачке"
 
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "Ellipsis"
 msgstr "Три тачке"
 
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Line wrap"
 msgstr "Прелом реда"
 
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
+#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
 msgid "Break characters"
 msgstr "Знаци за прелом"
 
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
+#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
 msgid "Max lines"
 msgstr "Највише линија"
 
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
+#: ../widgets/text/e-text.c:3668 ../widgets/text/e-text.c:3669
 msgid "Allow newlines"
 msgstr "Дозволи нове линије"
 
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
+#: ../widgets/text/e-text.c:3661 ../widgets/text/e-text.c:3662
 msgid "Draw borders"
 msgstr "Исцртај ивице"
 
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
 msgid "Draw background"
 msgstr "Исцртај позадину"
 
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
 msgid "Draw button"
 msgstr "Исцртај дугме"
 
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
 msgid "Cursor position"
 msgstr "Позиција курзора"
 
-#: ../widgets/text/e-entry.c:1342 ../widgets/text/e-entry.c:1343
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 msgid "Emulate label resize"
 msgstr "Опонашај промену величине ознаке"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2722
 msgid "Input Methods"
 msgstr "Методи уноса"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
 msgid "Bold"
 msgstr "Подебљано"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 msgid "Strikeout"
 msgstr "Прецртано"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3503 ../widgets/text/e-text.c:3504
 msgid "Anchor"
 msgstr "Веза"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Clip Width"
 msgstr "Исеци ширину"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Clip Height"
 msgstr "Исеци висину"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
 msgid "Clip"
 msgstr "Исеци"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
 msgid "Fill clip rectangle"
 msgstr "Испуни правоугаоник исечка"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
 msgid "X Offset"
 msgstr "X померање"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
 msgid "Y Offset"
 msgstr "Y померање"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3590
 msgid "Text width"
 msgstr "Ширина текста"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
 msgid "Text height"
 msgstr "Висина текста"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
 msgid "IM Context"
 msgstr "Контекст метода уноса"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Handle Popup"
 msgstr "Управљај искачућим прозором"
 
+#~ msgid "_Address: "
+#~ msgstr "_Адреса:"
+
+#~ msgid "Print cards"
+#~ msgstr "Штампај карте"
+
+#~ msgid "Organization"
+#~ msgstr "Организација"
+
+#~ msgid "E-mail"
+#~ msgstr "Е-пошта"
+
+#~ msgid "GTK Tree View"
+#~ msgstr "Преглед GTK стабла"
+
+#~ msgid "Print envelope"
+#~ msgstr "Штампај коверту"
+
+#~ msgid "Print contacts"
+#~ msgstr "Штампај контакте"
+
+#~ msgid "Print contact"
+#~ msgstr "Штампај контакт"
+
+#~ msgid "Error loading default addressbook."
+#~ msgstr "Грешка при учитавању подразумеваног именика."
+
+#~ msgid "Input File"
+#~ msgstr "Улазна датотека"
+
+#~ msgid "No filename provided."
+#~ msgstr "Име датотеке није дато."
+
+#~ msgid "Add Calendar"
+#~ msgstr "Додаје календар"
+
+#~ msgid "Add Task List"
+#~ msgstr "Додаје листу задужења"
+
+#~ msgid "_Add Calendar"
+#~ msgstr "_Додај календар"
+
+#~ msgid "_Add Task List"
+#~ msgstr "_Додај листу задужења"
+
+#~ msgid "Add New Calendar"
+#~ msgstr "Додај нови календар"
+
+#~ msgid "Calendar Group"
+#~ msgstr "Група календара"
+
+#~ msgid "Calendar Location"
+#~ msgstr "Место календара"
+
+#~ msgid "Calendar Name"
+#~ msgstr "Име календара"
+
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>Опције листе задужења</b>"
+
+#~ msgid "Add New Task List"
+#~ msgstr "Додај нову листу задужења"
+
+#~ msgid "Task List Group"
+#~ msgstr "Група за листе задужења"
+
+#~ msgid "Task List Name"
+#~ msgstr "Име листе задужења"
+
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>К_алендари за слободно/заузето</b>"
+
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>Учесталост објављивања</b>"
+
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>_Место објављивања</b>"
+
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Подешавања објављивања слободно/заузето"
+
+#~ msgid "_Daily"
+#~ msgstr "_Дневно"
+
+#~ msgid "_Manual"
+#~ msgstr "_Ручно"
+
+#~ msgid "_Weekly"
+#~ msgstr "_Недељно"
+
+#~ msgid "Enter the password for %s"
+#~ msgstr "Унесите лозинку за %s"
+
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "Изабрани дан (%a, %d. %b %Y.)"
+
+#~ msgid "%a %b %d"
+#~ msgstr "%a, %d. %b"
+
+#~ msgid "%a %d %Y"
+#~ msgstr "%a, %d. %Y."
+
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a, %d. %b %Y."
+
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "Изабрана недеља (%s - %s)"
+
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "Изабрани месец (%b %Y)"
+
+#~ msgid "Selected year (%Y)"
+#~ msgstr "Изабрана година (%Y)"
+
+#~ msgid "Print Item"
+#~ msgstr "Штампај предмет"
+
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+
+#~ msgid "No, Do not Change Status"
+#~ msgstr "Не, не мењај стање"
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>Примање поште</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>Слање поште:</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>Ова страна дозвољава да изаберете да ли желите да пошаљете "
+#~ "признаницу уз своју\n"
+#~ "поруку ради обавештења када буде прочитана, и да одредите шта Еволуција "
+#~ "да ради када неко Вама пошаље признаницу.</small>"
+
+#~ msgid "Always send back a read receipt"
+#~ msgstr "Увек врати признаницу"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "Питај ме желим ли да вратим признаницу"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "Никада не враћај признаницу"
+
+#~ msgid "Read Receipts"
+#~ msgstr "Признанице"
+
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "Затражи повраћај признанице за све поруке које пошаљем"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "Осим ако је порука послата дописној листи, а не мени лично"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr "Када примите поруку са признаницом, шта Еволуција да ради?"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Положај зоне."
+
+#~ msgid "Enable"
+#~ msgstr "Омогући"
+
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "Филтер важности „%s“"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "Неки од Netscape филтера за пошту засновани су\n"
+#~ "на приоритетима које Еволуција не користи.\n"
+#~ "Уместо тога Еволуција даје резултате у распону од\n"
+#~ "-3 до 3 који се додељују порукама и у складу са тиме\n"
+#~ "филтрирају.\n"
+#~ "\n"
+#~ "Као привремено решење, додата је група филтера имена \n"
+#~ "„Приоритетни филтер“ која претвара Netscape филтере за пошту у\n"
+#~ "резултате Еволуције, а промењени филтери користе резултате уместо\n"
+#~ "приоритета. Проверите увежене филтере да се уверите\n"
+#~ "да ли све ради као што би требало."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "Неки од Netscape филтера за пошту користе\n"
+#~ "могућност „Занемари расправу“ или „Прати расправу“\n"
+#~ "коју Еволуција не подржава.\n"
+#~ "Ови филтери ће бити изостављени."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "Неки од Netscape филтера за пошту проверавају\n"
+#~ "да ли у телу порука постоји (не)једнакост за дати низ,\n"
+#~ "што Еволуција не подржава. Ови филтери\n"
+#~ "су промењени да проверавају да ли тај низ јесте\n"
+#~ "или није садржан у телу поруке."
+
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Еволуција увози старе Netscape податке"
+
+#~ msgid "Importing Netscape data"
+#~ msgstr "Увожење Netscape података"
+
+#~ msgid "Settings"
+#~ msgstr "Подешавања"
+
+#~ msgid "Mail Filters"
+#~ msgstr "Филтери поште"
+
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Еволуција је пронашла Netscape датотеке поште.\n"
+#~ "Желите ли да буду увежене у Еволуцију?"
+
+#~ msgid "<span weight=\"bold\">Filter Options</span>"
+#~ msgstr "<span weight=\"bold\">Могућности филтера</span>"
+
+#~ msgid "<b>Recipients </b>"
+#~ msgstr "<b>Примаоци</b>"
+
+#~ msgid "<b>Action</b>"
+#~ msgstr "<b>Радња</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Датум и време</b>"
+
+#~ msgid "No output directory!"
+#~ msgstr "Нема излазне/крајње фасцикле!"
+
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr ""
+#~ "Излазна фасцикла није пронађена на iPod уређају! Молим проверите да ли је "
+#~ "џепни уређај правилно подешен и покушајте поново."
+
+#~ msgid "Could not export data!"
+#~ msgstr "Није могућ извоз података!"
+
+#~ msgid "Exporting data failed."
+#~ msgstr "Неуспешан извоз података."
+
+#~ msgid "Could not open addressbook!"
+#~ msgstr "Није могуће отворити именик!"
+
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "Не могу да отворим Еволуцијин именик како би извезао податке."
+
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "Не могу отворити календар/списак обавеза"
+
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr ""
+#~ "Не могу отворити Еволуцијин календар/списак за урадити да би извезао "
+#~ "податке."
+
+#~ msgid "New mail notify"
+#~ msgstr "Обавештење о новој пошти"
+
+#~ msgid "(Untitled)"
+#~ msgstr "(Неименовано)"
+
+#~ msgid "An attachment to add."
+#~ msgstr "Прилог за додавање."
+
+#~ msgid "Content type of the attachment."
+#~ msgstr "Тип садржаја прилога."
+
+#~ msgid "The filename to display in the mail."
+#~ msgstr "Име датотеке које се приказује у поруци."
+
+#~ msgid "Description of the attachment."
+#~ msgstr "Опис прилога."
+
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "Означи да се прилог подразумевано приказује унутар поруке."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Уреди..."
+
+#~ msgid "..."
+#~ msgstr "..."
+
+# 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 "Проба миникарте"
+
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Ауторско право (C) 2000, Helix Code, Inc."
+
+#~ msgid "This should test the minicard canvas item"
+#~ msgstr "Ово испробава поље миникарте"
+
 #~ msgid "Print Preview"
 #~ msgstr "Преглед пред штампу"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 6669caa5a3..137d0a126e 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-03-12 14:22+0100\n"
-"PO-Revision-Date: 2007-03-12 11:33+0100\n"
+"POT-Creation-Date: 2007-07-21 03:24+0100\n"
+"PO-Revision-Date: 2007-07-21 13:46+0200\n"
 "Last-Translator: Igor Nestorović <igor@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,21 +30,21 @@ msgstr ""
 # note(slobo): spam , Đubre --> Neželjena pošta
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "evolucijin imenik"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -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:707
+#: ../calendar/gui/calendar-component.c:726
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -180,7 +180,7 @@ 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:710
+#: ../calendar/gui/calendar-component.c:729
 #: ../calendar/gui/e-day-view-top-item.c:1315
 #: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
@@ -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:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:731
+#: ../calendar/gui/calendar-component.c:736
+#: ../calendar/gui/calendar-component.c:738
 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:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:765
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -218,7 +218,7 @@ 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:736
+#: ../calendar/gui/calendar-component.c:755
 #: ../calendar/gui/e-day-view-top-item.c:1319
 #: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
@@ -275,11 +275,11 @@ msgstr "iskačuće"
 msgid "popup a child"
 msgstr "iskačuće izvedeno"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "uređivanje"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "počinje uređivanjem ove ćelije"
 
@@ -326,17 +326,17 @@ msgstr "klik"
 msgid "sort"
 msgstr "razvrstavanje"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%d %B %Y."
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendar: od %s do %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "predmet evolucija kalendara"
 
@@ -426,7 +426,7 @@ msgstr "Neuspela autentifikacija na LDAP server."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
 msgid "Failed to delete contact"
 msgstr "Neuspelo brisanje kontakta"
 
@@ -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:511
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
@@ -570,7 +570,7 @@ msgstr "_Koristi tako kako je"
 # bug: we don't want this translated
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
@@ -580,17 +580,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za usklađivanje:"
 
-#: ../addressbook/conduit/address-conduit.c:1317
-#: ../addressbook/conduit/address-conduit.c:1318
+#: ../addressbook/conduit/address-conduit.c:1315
+#: ../addressbook/conduit/address-conduit.c:1316
 msgid "Could not load addressbook"
 msgstr "Nije moguće otvoriti imenik"
 
-#: ../addressbook/conduit/address-conduit.c:1395
-#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1393
+#: ../addressbook/conduit/address-conduit.c:1396
 msgid "Could not read pilot's Address application block"
 msgstr "Nije moguće čitanje programskog bloka adresa pilota"
 
@@ -612,9 +612,9 @@ 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:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:277 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -653,12 +653,12 @@ msgstr "Upravljajte S/MIME sertifikatima ovde"
 # On This Computer is always first and VFolders is always last
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:488
+#: ../calendar/gui/calendar-component.c:236
+#: ../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
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
@@ -672,54 +672,54 @@ msgstr "Na ovom računaru"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:496
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../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/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
 msgid "Personal"
 msgstr "Lično"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:506
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Napravi novi kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "Kontakt li_sta"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Napravi novu kontakt listu"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1208
 msgid "New Address Book"
 msgstr "Novi imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "_Imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Napravi novi imenik"
 
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Neuspela nadogradnja podešavanja imenika ili njegovih fascikli."
 
@@ -728,8 +728,7 @@ msgid "Base"
 msgstr "Baza"
 
 #: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "_Tip:"
 
@@ -740,17 +739,17 @@ msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
 #: ../addressbook/gui/component/addressbook-config.c:984
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2087
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Opšte"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
+#: ../addressbook/gui/widgets/e-addressbook-view.c:565
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Imenik"
@@ -770,7 +769,7 @@ msgid "Details"
 msgstr "Detalji"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../mail/em-folder-browser.c:849
 msgid "Searching"
 msgstr "Pretraživanje"
 
@@ -778,31 +777,31 @@ msgstr "Pretraživanje"
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1206
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Podešavanja imenika"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "Prenošenje..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Prenošenje ’%s‘:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:634
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:749
 msgid "Autocompletion Settings"
 msgstr "Podešavanja samodopunjavanja"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1124
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -814,7 +813,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1138
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -824,7 +823,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1147
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -834,7 +833,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -870,14 +869,14 @@ msgstr "_Novi imenik"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:990
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1148
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Obriši"
@@ -887,12 +886,12 @@ msgid "Save As Vcard..."
 msgstr "Sačuvaj kao VKartu..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
+#: ../calendar/gui/calendar-component.c:591
+#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
 msgid "_Properties..."
 msgstr "Po_dešavanja..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "Birač izvora za kontakte"
 
@@ -901,29 +900,29 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupanje LDAP serveru"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:513
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:507
 msgid "Failed to authenticate.\n"
 msgstr "Neuspela autentifikacija.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:493
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:487
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Dužina samodopunjavanja"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML za listu adresa za dopunjavanje"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML za listu adresa za dopunjavanje."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
@@ -931,11 +930,11 @@ msgstr ""
 "Položaj uspravne površi, između karte i liste pregleda i panela za pregled, "
 "u pikselima."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "Prikaži površ za pregled"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -943,20 +942,20 @@ msgstr ""
 "Broj znakova koji se moraju ukucati pre nego što Evolucija pokuša da "
 "samodopuni."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresa za poslednju korišćenu fasciklu u prozorčetu za izbor imena"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Adresa za poslednju korišćenu fasciklu u prozorčetu za izbor imena."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Položaj uspravne površi"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Da li se prikazuje površ za pregled."
 
@@ -981,7 +980,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentifikacija</b>"
 
@@ -1116,8 +1114,8 @@ msgid ""
 "vulnerable to security exploits."
 msgstr ""
 "Odabir ove mogućnosti znači da server ne podržava ni SSL ni TLS šifrovanje. "
-"To znači da Vaša veza neće biti sigurna, i da ćete biti ranjivi na "
-"sigurnosne napade. "
+"To znači da Vaša veza neće biti sigurna, i da ćete biti ranjivi na sigurnosne "
+"napade. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1153,8 +1151,8 @@ msgid ""
 msgstr ""
 "Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo "
 "direktorijuma. Obim pretrage „pod“ će uključiti sve unose ispod baze za "
-"pretragu. Obim pretrage „jedan“ će uključiti samo unose jedan nivo ispod "
-"Vaše baze."
+"pretragu. Obim pretrage „jedan“ će uključiti samo unose jedan nivo ispod Vaše "
+"baze."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
@@ -1178,8 +1176,8 @@ msgid ""
 "server."
 msgstr ""
 "Ovo je metod koji će Evolucija koristiti da Vas prijavi.  Primetite da "
-"njegovo uključivanje na „Elektronska adresa“ zahteva anonimni pristup na "
-"ldap server."
+"njegovo uključivanje na „Elektronska adresa“ zahteva anonimni pristup na ldap "
+"server."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1228,9 +1226,8 @@ msgid "_Login method:"
 msgstr "Metod _prijave:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:225
+#: ../mail/mail-config.glade.h:169
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ime:"
@@ -1244,7 +1241,7 @@ msgid "_Search scope:"
 msgstr "Obim p_retrage:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:176
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erver:"
@@ -1264,12 +1261,11 @@ msgstr "karte"
 # bug: plural-forms
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../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
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/calendar-weather/calendar-weather.c:561
 msgid "minutes"
 msgstr "minuta"
 
@@ -1310,13 +1306,13 @@ msgid "<b>Work</b>"
 msgstr "<b>Posao</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:194
@@ -1324,9 +1320,9 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../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
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
@@ -1367,16 +1363,17 @@ msgstr "Telefon"
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:155
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Posao"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
 msgstr "_Adresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
@@ -1392,9 +1389,9 @@ msgid "_Birthday:"
 msgstr "_Rođendan:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:888
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1833
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
@@ -1487,26 +1484,26 @@ msgid "_Zip/Postal Code:"
 msgstr "Poš_tanski broj:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
 msgid "Address"
 msgstr "Adresa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../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:1833 ../widgets/text/e-entry.c:1265
-#: ../widgets/text/e-entry.c:1266 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../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
 msgid "Editable"
 msgstr "Izmenljivo"
 
@@ -2480,10 +2477,11 @@ msgid "Zimbabwe"
 msgstr "Zimbabve"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:354
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Ime"
@@ -2493,8 +2491,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL brzi glasnik"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Jabber"
 msgstr "Džaber"
 
@@ -2507,8 +2505,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu'Gadu glasnik"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2528,72 +2526,72 @@ msgid "Username"
 msgstr "Korisničko ime"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Kuća"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Drugo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Izvorna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Obavezna polja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Promenjeno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Uređivač za kontakte - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
 msgid "_No image"
 msgstr "_Bez slike"
 
@@ -2625,23 +2623,23 @@ msgstr "%s„%s“ je prazan"
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:297
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:349
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:360
 msgid "_Select Address Book"
 msgstr "_Izaberi imenik"
 
@@ -2695,10 +2693,6 @@ msgstr "Držav_a:"
 msgid "Full Address"
 msgstr "Puna adresa"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "_Adresa:"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Poštanski broj:"
@@ -2712,7 +2706,7 @@ msgid "Esq."
 msgstr "Poš."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Puno ime"
 
@@ -2784,7 +2778,7 @@ msgstr "Usluga _brzog glasnika:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Mesto:"
 
@@ -2830,9 +2824,9 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ukucajte elektronsku adresu ili prevucite kontakt u donju listu:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
@@ -2887,27 +2881,47 @@ msgstr ""
 "Ime ili elektronska adresa ovog kontakta već postoji\n"
 "u ovoj fascikli.  Želite li ipak da dodate?"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#, fuzzy
+msgid "Merge Contact"
+msgstr "Novi kontakt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#, fuzzy
+msgid "Merge"
+msgstr "Poruka"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "E-pošta"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2915,38 +2929,37 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:239
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "Upit"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Greška pri učitavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../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:3337
+#: ../widgets/table/e-table.c:3340
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
+#: ../widgets/text/e-text.c:3468 ../widgets/text/e-text.c:3469
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 msgid "Source"
 msgstr "Izvor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:246
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:500
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2954,77 +2967,77 @@ msgstr "Izvor"
 msgid "Type"
 msgstr "Tip"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:838
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2049
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Sačuvaj kao VKartu..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../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
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:961
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
 msgid "New Contact _List..."
 msgstr "Novi kontakt _spisak..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Save as VCard..."
 msgstr "_Sačuvaj kao VKartu..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contact"
 msgstr "Pošalji poruku ko_ntaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "Send _Message to List"
 msgstr "Pošalji poruku na _listu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
 msgid "Send _Message to Contacts"
 msgstr "Pošalji po_ruku kontaktima"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "_Print"
 msgstr "Šta_mpaj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
 msgid "Cop_y to Address Book..."
 msgstr "Umnoži u i_menik..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 msgid "Mo_ve to Address Book..."
 msgstr "Premesti u imeni_k..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:988
-#: ../calendar/gui/calendar-component.c:583
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:589
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3185 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1134 ../mail/message-list.c:1922
+#: ../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
 #: ../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
@@ -3032,30 +3045,25 @@ msgstr "_Iseci"
 msgid "_Copy"
 msgstr "_Umnoži"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
 msgid "P_aste"
 msgstr "_Ubaci"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1636
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1871
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1927
-msgid "Print cards"
-msgstr "Štampaj karte"
-
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Other error"
 msgstr "Druga greška"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Assistant"
 msgstr "Pomoćnik"
 
@@ -3092,84 +3100,79 @@ msgid "Categories"
 msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Telefon preduzeća"
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#, fuzzy
+msgid "Company"
+msgstr "Pr_eduzeće:"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "E-pošta"
+msgid "Company Phone"
+msgstr "Telefon preduzeća"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "E-pošta 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "E-pošta 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Smesti kao"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Kućni faks"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Kućni telefon 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Dnevnik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Manager"
 msgstr "Upravnik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "Note"
 msgstr "Napomena"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "Organizacija"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3191,7 +3194,6 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
 #: ../calendar/gui/e-meeting-list-view.c:511
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
@@ -3199,7 +3201,7 @@ msgid "Role"
 msgstr "Uloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Spouse"
 msgstr "Supružnik"
 
@@ -3241,7 +3243,7 @@ msgstr "Veb strana"
 #: ../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:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 msgid "Width"
 msgstr "Širina"
 
@@ -3256,7 +3258,7 @@ msgstr "Širina"
 #: ../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:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
 msgid "Height"
 msgstr "Visina"
 
@@ -3357,143 +3359,140 @@ msgstr "Izabrano"
 msgid "Has Cursor"
 msgstr "Ima kursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:630
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u čitaču"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2545
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2602
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:631
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Umnoži elektronsku _adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:456
+#: ../addressbook/gui/widgets/eab-contact-display.c:758
 msgid "List Members"
 msgstr "Članovi liste"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Department"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Profession"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Video Chat"
 msgstr "_Video razgovor:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2305
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../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
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../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
+#: ../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/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
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:370
+#: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home Page"
 msgstr "_Lična strana:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
 msgid "Web Log"
 msgstr "_Veb log:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Birthday"
 msgstr "_Rođendan:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Anniversary"
 msgstr "_Godišnjica:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:776
 msgid "Job Title"
 msgstr "Titula na poslu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
 msgid "Home page"
 msgstr "Lična stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Success"
 msgstr "Uspeh"
 
 # E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Backend busy"
 msgstr "Osnovni proces je zauzet"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Repository offline"
 msgstr "Arhiva van mreže"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Address Book does not exist"
 msgstr "Imenik ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "No Self Contact defined"
 msgstr "Lični kontakt nije definisan"
 
@@ -3502,75 +3501,75 @@ msgstr "Lični kontakt nije definisan"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Zabranjen pristup"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact not found"
 msgstr "Kontakt nije pronađen"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact ID already exists"
 msgstr "IB kontakta već postoji"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2516
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
 msgid "Canceled"
 msgstr "Otkazano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Could not cancel"
 msgstr "Nije moguće odustati"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Authentication Required"
 msgstr "Autentifikacija obavezna"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 # E_BOOK_ERROR_NO_SUCH_SOURCE
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "No such source"
 msgstr "Nema takvog izvora"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Not available in offline mode"
 msgstr "Nije dostupno u režimu van mreže"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Invalid server version"
 msgstr "Neispravna verzija servera"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:95
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3580,7 +3579,7 @@ msgstr ""
 "korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte ovaj "
 "imenik kada se povežete radi preuzimanja njegovog sadržaja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3589,7 +3588,7 @@ msgstr ""
 "Otvaranje ovog imenika nije moguće.  Proverite da putanja %s postoji i da "
 "imate prava pristupa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3597,7 +3596,7 @@ msgstr ""
 "Otvaranje ovog imenika nije moguće.  To znači da ste ili uneli pogrešnu "
 "adresu, ili je LDAP server nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3607,7 +3606,7 @@ msgstr ""
 "koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
 "podrškom za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3615,7 +3614,7 @@ msgstr ""
 "Otvaranje ovog imenika nije moguće.  To znači da ste ili uneli pogrešnu "
 "adresu, ili je server nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3627,7 +3626,7 @@ msgstr ""
 "Preciznije oblikujte upit ili povećajte ograničenje\n"
 "broja rezultata u postavkama imenika za server direktorijuma."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3639,45 +3638,45 @@ msgstr ""
 "upit ili povećajte vremensko ograničenje u postavkama imenika\n"
 "za server direktorijuma."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osnovni proces ovog imenika nije mogao da obradi upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osnovni proces ovog imenika je odbio da obavi ovaj upit."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspešno završen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:660
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:293
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3696,7 +3695,7 @@ msgstr[2] ""
 "Da li zaista želite da prikažete ove kontakte?"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3705,15 +3704,15 @@ msgstr ""
 "%s već postoji\n"
 "Želite li da prepišete?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:329
 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:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
@@ -3721,49 +3720,49 @@ msgstr[1] "kontakti"
 msgstr[2] "kontakta"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:464
 msgid "Select Address Book"
 msgstr "Izaberi imenik"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:605
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:771
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Copy contact to"
 msgstr "Umnoži kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
+#: ../addressbook/gui/widgets/eab-gui-util.c:778
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 msgid "Multiple VCards"
 msgstr "Brojne VKarte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
 #, c-format
 msgid "VCard for %s"
 msgstr "VKarta za %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1048
+#: ../addressbook/gui/widgets/eab-gui-util.c:1066
 msgid "Contact information"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#: ../addressbook/gui/widgets/eab-gui-util.c:1068
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontakt podaci za %s"
@@ -3772,7 +3771,7 @@ msgstr "Kontakt podaci za %s"
 msgid "Querying Address Book..."
 msgstr "Slanje upita imeniku..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3780,16 +3779,16 @@ msgstr[0] "Postoji još %d kontakt."
 msgstr[1] "Postoji još %d kontakta."
 msgstr[2] "Postoji još %d kontakta."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:281
 msgid "Show Full VCard"
 msgstr "Prikaži punu VKartu"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
 msgid "Show Compact VCard"
 msgstr "Prikaži sažetu VKartu"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:286
 msgid "Save in addressbook"
 msgstr "Sačuvaj u imenik"
 
@@ -3797,17 +3796,11 @@ msgstr "Sačuvaj u imenik"
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Pregled GTK stabla"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Uvoženje..."
 
@@ -3851,20 +3844,6 @@ msgstr "VKarta (.vcf, .gcrd)"
 msgid "Evolution VCard Importer"
 msgstr "Evolucija VKarta uvoznik"
 
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Štampaj kovertu"
-
-#: ../addressbook/printing/e-contact-print.c:856
-msgid "Print contacts"
-msgstr "Štampaj kontakte"
-
-#: ../addressbook/printing/e-contact-print.c:882
-#: ../addressbook/printing/e-contact-print.c:909
-msgid "Print contact"
-msgstr "Štampaj kontakt"
-
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 p. Tahoma"
@@ -3910,7 +3889,7 @@ msgstr "Format"
 #: ../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:1895
+#: ../widgets/table/e-table-header-item.c:1898
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Zaglavlje"
@@ -3964,7 +3943,6 @@ msgid "Options"
 msgstr "Opcije"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Položaj"
 
@@ -4014,9 +3992,9 @@ msgstr "Senčenje"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:963
 #: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Veličina:"
 
@@ -4033,7 +4011,7 @@ msgid "Top:"
 msgstr "Vrh:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "Tip:"
 
@@ -4050,7 +4028,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "Proba uređivača stila za štampanje kontakta"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:47
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Autorsko pravo (C) 2000, Ximian, Inc."
 
@@ -4058,16 +4036,16 @@ msgstr "Autorsko pravo (C) 2000, Ximian, Inc."
 msgid "This should test the contact print style editor widget"
 msgstr "Ovo isprobava element uređivača stila za štampanje kontakta"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:46
 msgid "Contact Print Test"
 msgstr "Proba štampe kontakta"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:49
 msgid "This should test the contact print code"
 msgstr "Ovo isprobava kod za štampu kontakta"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Datoteka ne može biti otvorena"
@@ -4080,91 +4058,81 @@ msgstr "Lista imenika nije dostupna"
 msgid "failed to open book"
 msgstr "neuspelo otvaranje knjige"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "List local addressbook folders"
 msgstr "Lista fascikle lokalnog imenika"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "Prikaži karte kao vkartu ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 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 asychronous mode, default size 100."
+"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."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Greška u argumentima komande, koristite opciju --help da vidite kako se "
 "koristi."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv ili vcard oblik."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "U neusklađenom režimu, izlaz mora biti datoteka."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom režimu, nema potrebe za podešavanjem veličine."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Greška pri učitavanju podrazumevanog imenika."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Ulazna datoteka"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Ime datoteke nije dato."
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
-"Dodavanjem smislenog kratkog opisa Vašem sastanku daćete primaocima do "
-"znanja u vezi čega zakazujete sastanak."
+"Dodavanjem smislenog kratkog opisa Vašem sastanku daćete primaocima do znanja "
+"u vezi čega zakazujete sastanak."
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"Dodavanjem smislenog kratkog opisa Vašem zaduženju daćete primaocima do "
-"znanja šta je zaduženje."
+"Dodavanjem smislenog kratkog opisa Vašem zaduženju daćete primaocima do znanja "
+"šta je zaduženje."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
@@ -4265,46 +4233,51 @@ 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?"
+
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Sigurno želite da zakažete sastanak bez sačinjenog pregleda?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Sigurno želite da pošaljete zaduženje bez sačinjenog pregleda?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:24
 msgid "Cannot create a new event"
 msgstr "Ne mogu napraviti jedan novi događaj"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "Obrisati kalendar ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Delete memo list '{0}'?"
 msgstr "Obrisati spisak beleški „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "Obrisati spisak zaduženja ’{0}‘?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Do _not Send"
 msgstr "Ne šalj_i"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Preuzimanje u toku. Želite li da sačuvate zakazani sastanak?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Preuzimanje u toku. Želite li da sačuvate zaduženje?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Uređivač nije mogao biti učitan."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4313,26 +4286,26 @@ msgstr ""
 "zaduženje."
 
 # bug: what's RSVP?
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Pozivnice će biti poslate e-poštom svim učesnicima i omogućiće im da "
 "odgovore."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "Greška pri učitavanju kalendara"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading memo list"
 msgstr "Greška pri učitavanju spiska beleški"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Greška pri učitavanju spiska zaduženja"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../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."
@@ -4340,7 +4313,7 @@ msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 "znati da je dnevnik obrisan."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../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."
@@ -4348,7 +4321,7 @@ msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 "znati da je sastanak otkazan."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4356,15 +4329,15 @@ msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 "znati da je zaduženje obrisano."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
-"Slanje osveženih podataka omogućava ostalim učesnicima da njihov kalendar "
-"bude u toku."
+"Slanje osveženih podataka omogućava ostalim učesnicima da njihov kalendar bude "
+"u toku."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4372,7 +4345,7 @@ msgstr ""
 "Slanje osveženih podataka omogućava ostalim učesnicima da njihov spisak "
 "zaduženja bude u toku."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4380,7 +4353,7 @@ msgstr ""
 "Preuzima se nekoliko priloga. Ukoliko sada sačuvate zakazani sastanak ovi "
 "prilozi neće biti sačuvani sa njim."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4388,85 +4361,84 @@ msgstr ""
 "Preuzimanje nekoliko priloga je u toku. Ukoliko sada sačuvate zaduženje ovi "
 "prilozi neće biti sačuvani sa njim."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server."
 msgstr "Na tekućoj verziji servera neke mogućnosti možda neće ispravno raditi"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalendar Evolucije je neočekivano završio."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Kalendar Evolucije je neočekivano završio."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolucija zaduženja su neočekivano završila."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid "The calendar is not marked for offline usage."
 msgstr "Ovaj kalendar nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "The memo list is not marked for offline usage"
 msgstr "Ovaj spisak beleški nije označen za korišćenje van mreže"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "The task list is not marked for offline usage."
 msgstr "Spisak zaduženja nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "This calendar will be removed permanently."
 msgstr "Ovaj kalendar će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "This memo list will be removed permanently."
 msgstr "Ovaj spisak beleški će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "This task list will be removed permanently."
 msgstr "Ovaj spisak zaduženja će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Želite li da sačuvate promene na zakazanom sastanku?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this memo?"
 msgstr "Želite li da sačuvate promene u ovim beleškama?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 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:56
+#: ../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?"
+msgstr "Želite li da pošaljete obaveštenje o otkazivanju za ovaj unos u dnevnik?"
 
 # calendar:prompt-cancel-task primary
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Želite li da pošaljete svim učesnicima obaveštenje o otkazivanju?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Želite li da pošaljete pozive na sastanak učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send this task to participants?"
 msgstr "Želite li da pošaljete ovo zaduženje učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Želite li da pošaljete osvežene podatke o sastanku učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated task information to participants?"
 msgstr "Želite li da pošaljete osvežene podatke o zaduženju učesnicima?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4475,7 +4447,7 @@ msgstr ""
 "Povezujete se na nepodržan GroupWise server što može da dovede do problema u "
 "radu Evolucije. Najbolje je da server bude nadograđen na podržanu verziju."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
@@ -4483,111 +4455,110 @@ msgstr ""
 "Izabrali ste izvor kalendara koji je samo za čitanje. Promenite na Pregled "
 "kalendara i naznačite kalendar koji može prihvatiti sastanke."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Promenili ste ovaj zakazani sastanak, ali promene još niste sačuvali."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have changed this task, but not yet saved it."
 msgstr "Promenili ste ovo zaduženje, ali promene još niste sačuvali."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Promenili ste ovu belešku, ali promene još niste sačuvali."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Kalendari neće biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Beleška neće biti dostupna dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Zaduženja neće biti dostupna dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Zanemari promene"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "_Save Changes"
 msgstr "Sačuvaj pro_mene"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "_Send Notice"
 msgstr "Pošalji po_dsetnik"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:253
 msgid "Split Multi-Day Events:"
 msgstr "Podeli višednevne događaje:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1506
-#: ../calendar/conduits/calendar/calendar-conduit.c:1507
-#: ../calendar/conduits/memo/memo-conduit.c:932
-#: ../calendar/conduits/memo/memo-conduit.c:933
-#: ../calendar/conduits/todo/todo-conduit.c:1108
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../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
 msgid "Could not start evolution-data-server"
 msgstr "Neuspelo pokretanje evolucija-servera-podataka"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1614
-#: ../calendar/conduits/calendar/calendar-conduit.c:1617
+#: ../calendar/conduits/calendar/calendar-conduit.c:1612
+#: ../calendar/conduits/calendar/calendar-conduit.c:1615
 msgid "Could not read pilot's Calendar application block"
 msgstr "Neuspelo čitanje programskog bloka pilotovog Kalendara"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1026
-#: ../calendar/conduits/memo/memo-conduit.c:1029
+#: ../calendar/conduits/memo/memo-conduit.c:1024
+#: ../calendar/conduits/memo/memo-conduit.c:1027
 msgid "Could not read pilot's Memo application block"
 msgstr "Neuspelo čitanje pilotovog bloka beleški"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1073
-#: ../calendar/conduits/memo/memo-conduit.c:1076
+#: ../calendar/conduits/memo/memo-conduit.c:1071
+#: ../calendar/conduits/memo/memo-conduit.c:1074
 msgid "Could not write pilot's Memo application block"
 msgstr "Neuspeo upis pilotovog bloka beleški"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:237
 msgid "Default Priority:"
 msgstr "Podrazumevana važnost:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1192
-#: ../calendar/conduits/todo/todo-conduit.c:1195
+#: ../calendar/conduits/todo/todo-conduit.c:1190
+#: ../calendar/conduits/todo/todo-conduit.c:1193
 msgid "Could not read pilot's ToDo application block"
 msgstr "Neuspelo čitanje pilotovog ToDo programskog bloka"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1237
-#: ../calendar/conduits/todo/todo-conduit.c:1240
+#: ../calendar/conduits/todo/todo-conduit.c:1235
+#: ../calendar/conduits/todo/todo-conduit.c:1238
 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:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2219
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zaduženja"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1380
 msgid "Calendars"
 msgstr "Kalendari"
 
@@ -4628,22 +4599,24 @@ msgid "Memo_s"
 msgstr "Be_leške"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../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/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:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:483
+#: ../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/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:403
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:547
+#: ../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-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Zaduženja"
@@ -4671,11 +4644,10 @@ msgstr[2] "minuta"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../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-weather/calendar-weather.c:564
+#: ../plugins/calendar-weather/calendar-weather.c:562
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -4693,10 +4665,10 @@ msgstr "Zakazani sastanci"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1570
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 #: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../plugins/itip-formatter/itip-view.c:998
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -4706,16 +4678,16 @@ 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:160
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:163
 #: ../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
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Uređivanje"
 
@@ -4727,32 +4699,32 @@ msgstr "Dre_manje"
 msgid "location of appointment"
 msgstr "zakazano mesto sastanka"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1429
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1552
 msgid "No summary available."
 msgstr "Nema dostupnog pregleda."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1438
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1440
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
 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:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
 #, c-format
 msgid "You have %d alarms"
 msgstr "Broj postavljenih alarma: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1654
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1658
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4764,7 +4736,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:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4781,7 +4753,7 @@ msgstr ""
 "\n"
 "Sigurno želite da pokrenete ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1751
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -4829,166 +4801,165 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Programi za alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Traži potvrdu za brisanje predmeta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Boja pozadine zaduženja za danas, u obliku „#rrggbb“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Boja pozadine neispunjenih zaduženja, u obliku „#rrggbb“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalendari za koje se pokreće alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Boja za iscrtavanje Markus Bejns linije u liniji vremena (podrazumevano je "
 "prazno)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Boja za iscrtavanje Markus Bejns linije u dnevnom pregledu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Sažmi vikende u mesečni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "Potvrdi pražnjenje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Potrebno je označiti dane kojima počinju i završavaju se radni časovi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za sastanak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "Direktorijum za čuvanje zvučnih datoteka alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "Stepen događaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "Providnost događaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "Adrese servera za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "Stepen događaja u pregledu kalendara."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Sakrij završena zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Sakrij jedinice zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Sakrij vrednost zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Pozicija položene površi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Sat kojim se završava radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 "
 "do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
-"Sat kojim počinje radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 do "
-"23."
+"Sat kojim počinje radna nedelja, u dvadesetčetvoročasovnom obliku, od 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "Poslednje vreme za alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "Spisak adresa servera za objavljivanje slobodnog/zauzetog vremena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Boja Markus Bejns linije - dnevni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Boja Markus Bejns linije - linija vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut kojim se završava radni dan, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut kojim počinje radni dan, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "Pozicija položene površi mesečnog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "Pozicija uspravne površi mesečnog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "Broj jedinica za određivanje podrazumevanog podsetnika."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "Broj jedinica za određivanje kada sakriti zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "Boja prekoračenih zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4996,7 +4967,7 @@ msgstr ""
 "Pozicija položene površi, između dela kalendara za datum i liste zaduženja "
 "kada nije postavljen mesečni pregled, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5004,7 +4975,7 @@ msgstr ""
 "Pozicija položene površi, između pregleda i dela kalendara za datum i liste "
 "zaduženja u mesečnom pregledu, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5012,7 +4983,7 @@ msgstr ""
 "Položaj uspravne površi, između liste kalendara i navigacije kalendara po "
 "datumu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5020,7 +4991,7 @@ msgstr ""
 "Pozicija uspravne površi, između liste zaduženja i panela za pregled "
 "zaduženja, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5028,7 +4999,7 @@ msgstr ""
 "Pozicija uspravne površi, između pregleda i dela kalenda za datum i liste "
 "zaduženja u mesečnom pregledu, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5036,70 +5007,69 @@ msgstr ""
 "Pozicija uspravne površi, između pregleda i dela kalendara za datum i liste "
 "zaduženja kada nije postavljen mesečni pregled, u pikselima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programi koji mogu biti pokrenuti alarmima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "Direktorijum za čuvanje zvučnih alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Prikaži RSVP polje u uređivaču događaja/zaduženja/susreta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Prikaži polje uloge u uređivaču događaja/zaduženja/susreta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
-msgstr ""
-"Prikazuje vremena završetka sastanaka u nedeljnim i mesečnim pregledima"
+msgstr "Prikazuje vremena završetka sastanaka u nedeljnim i mesečnim pregledima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Prikaži polje kategorije u uređivaču događaja/susreta/zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "Prikazuje alarme u obaveštajnoj zoni"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 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.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži površ „Pregled“"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Show the \"Preview\" pane."
 msgstr "Prikazuje površ „Pregled“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Prikaži polje vremenske zone u uređivaču događaja (susreta)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Prikaži polje „Vrsta“ u uređivaču događaja/zaduženja/susreta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "Prikazuje brojeve nedelja u delu za datum"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "Boja zaduženja za danas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "Pozicija uspravne površi zaduženja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5108,7 +5078,7 @@ msgstr ""
 "Model adrese za korišćenje u povraćaju vremena slobodno/zauzeto, %u se "
 "zamenjuje korisničkim delom elektronske adrese, a %d domenom."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5116,20 +5086,20 @@ msgstr ""
 "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
 "neprevedeno mesto baze vremenske zone Olsen, kao „Amerika/Njujork“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "Podela _vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "Vreme poslednjeg pokretanja alarma, u time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5137,41 +5107,41 @@ msgstr ""
 "Providnost dokađaja u pregledu kalendara, vrednost između 0 (providno) i 1 "
 "(neprovidno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24-časovni oblik vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“, ili „dani“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "Početak nedelje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dan kojim počinje nedelja, od nedelje (0) do subote (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Da li da koristi obaveštajnu zonu za prikazivanje alarma."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Da li da traži potvrdu za brisanje sastanka ili zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Da li da traži potvrdu pri izbacivanju sastanka i zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5179,122 +5149,151 @@ msgstr ""
 "Da li da sažme vikende u mesečnom pregledu, koji subotu i nedelju stavlja u "
 "prostor radne nedelje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
-"Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim "
-"pregledima."
+"Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim pregledima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Da li da sakrije završena zaduženja u pregledu zaduženja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "Da li da postavi podrazumevani podsetnik za zakazane sastanke."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Da li da prikaže RSVP polje u uređivaču događaja/zaduženja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Da li da prikaže polje kategorije u uređivaču događaja (sastanaka)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Da li da prikaže polje sa ulogom u uređivaču događaja/zaduženja/susreta."
+msgstr "Da li da prikaže polje sa ulogom u uređivaču događaja/zaduženja/susreta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Da li da prikaže polje sa stanjem u uređivaču događaja/zaduženja/susreta."
+msgstr "Da li da prikaže polje sa stanjem u uređivaču događaja/zaduženja/susreta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Da li da prikaže vreme u dvadesetočasovnom obliku umesto am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Da li da prikaže polje vremenske zone u uređivaču događaja (sastanaka)."
+msgstr "Da li da prikaže polje vremenske zone u uređivaču događaja (sastanaka)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje vrstu u uređivaču događaja/zaduženja/susreta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Da li da prikaže brojeve nedelja u delu za datum."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
-msgstr ""
-"Dali da se koristi letnje računanje vremena kada se prikazuju događaji."
+msgstr "Dali da se koristi letnje računanje vremena kada se prikazuju događaji."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "Radni dani"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "Čas kojim se završava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "Minut kojim se završava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "Čas kojim počinje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "Minut kojim počinje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "Letnje računanje vremena"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "Pregled sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Category is"
 msgstr "Kategorija je"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Location contains"
 msgstr "Mesto sadrži"
 
-#: ../calendar/gui/cal-search-bar.c:432
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 days Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:635
+#, fuzzy
+msgid "Active Tasks"
+msgstr "_Dodeljeno zaduženje"
+
+#: ../calendar/gui/cal-search-bar.c:639
+#, fuzzy
+msgid "Over Due Tasks"
+msgstr "_Neispunjena zaduženja:"
+
+#: ../calendar/gui/cal-search-bar.c:643
+#, fuzzy
+msgid "Completed Tasks"
+msgstr "Završeno "
+
+#: ../calendar/gui/cal-search-bar.c:647
+#, fuzzy
+msgid "Tasks With Attachments"
+msgstr "Poruke sa prilozima"
+
+#: ../calendar/gui/cal-search-bar.c:693
+#, fuzzy
+msgid "Active Appointments"
+msgstr "Zakazani sastanci"
+
+#: ../calendar/gui/cal-search-bar.c:697
+#, fuzzy
+msgid "Next 7 Day Appointments"
+msgstr "Celo_dnevni sastanak"
+
+#: ../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
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5303,15 +5302,14 @@ msgstr ""
 "Ova radnja će trajno obrisati sve događaje pre izabranog roka. Ukoliko "
 "nastavite, nećete moći da povratite ove događaje."
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../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-weather/calendar-weather.c:563
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "dana"
@@ -5320,89 +5318,89 @@ msgstr "dana"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:265
+#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:223
 msgid "On The Web"
 msgstr "Na vebu"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i godišnjice"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:588
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:918
 msgid "Failed upgrading calendars."
 msgstr "Neuspela dopuna kalendara."
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1217
 #, 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:1214
+#: ../calendar/gui/calendar-component.c:1233
 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:1336
+#: ../calendar/gui/calendar-component.c:1355
 msgid "Calendar Source Selector"
 msgstr "Birač izvora kalendara"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1563
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1564
 msgid "_Appointment"
 msgstr "_Zakazani sastanak"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1565
 msgid "Create a new appointment"
 msgstr "Zakazuje novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1571
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1572
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1573
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1579
 msgid "New all day appointment"
 msgstr "Novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1580
 msgid "All Day A_ppointment"
 msgstr "Celo_dnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1581
 msgid "Create a new all-day appointment"
 msgstr "Pravi novi celodnevni sastanak"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1587
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1588
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1589
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
@@ -5422,6 +5420,18 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 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"
+
+#: ../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"
+
 #: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "Greška pri otvaranju kalendara"
@@ -5434,11 +5444,11 @@ msgstr "Metod nije podržan pri otvaranju kalendara"
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1273
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1282
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
 msgstr "Navij sat"
 
@@ -5486,67 +5496,72 @@ msgid "Run a program"
 msgstr "Pokreće program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#, fuzzy
+msgid "Select A File"
+msgstr "Izaberite datoteku"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Pošalji:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Šalje elektronsku poruku"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "Po_novi alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Zvuk:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "posle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pre"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "dan(i)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kraj sastanka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "sat(i)"
 
 # bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut(i)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr "Radnja/pokretač"
 
@@ -5563,7 +5578,6 @@ msgstr "Alarmi"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../composer/e-msg-composer-select-file.c:98
 #: ../composer/e-msg-composer-select-file.c:118
 msgid "_Suggest automatic display of attachment"
@@ -5573,7 +5587,7 @@ msgstr "_Predloži automatski prikaz priloga"
 msgid "Attach file(s)"
 msgstr "Prilaže datoteku(e)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za koje zvoni sat"
 
@@ -5599,7 +5613,7 @@ msgstr ""
 "<i>%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Upozorenja</span>"
 
@@ -5679,8 +5693,7 @@ msgstr ""
 "Nedelja"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid "Pick a color"
 msgstr "Bira boju"
 
@@ -5827,81 +5840,46 @@ msgstr "_Sre"
 msgid "before every appointment"
 msgstr "pre svakog sastanka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:268
 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:290
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 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:292
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 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:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:342
 msgid "C_olor:"
 msgstr "_Boja:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 msgid "Task List"
 msgstr "Spisak zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:388
 msgid "Memo List"
 msgstr "Spisak beleški"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:479
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Task List Properties"
 msgstr "Osobine liste zaduženja"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:630
 msgid "New Memo List"
 msgstr "Novi spisak beleški"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Dodaje kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Dodaje listu zaduženja"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Dodaj kalendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Dodaj listu zaduženja"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "O_sveži:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_Adresa :"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "nedelje"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
@@ -5946,40 +5924,40 @@ msgstr "%s  Načinili ste promene. Zanemariti ih i osvežiti uređivač?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste načinili promene, osvežiti uređivač?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2392
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
 msgid " to "
 msgstr " za "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2396
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
 msgid " (Completed "
 msgstr " (Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2398
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
 msgid "Completed "
 msgstr "Završeno "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2403
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
 msgid " (Due "
 msgstr " (Do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2405
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
 msgid "Due "
 msgstr "Do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2921
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2960
 #, 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:2926
-#: ../composer/e-msg-composer.c:3122
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2965
+#: ../composer/e-msg-composer.c:3160
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5987,22 +5965,22 @@ 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:3186
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1030 ../mail/message-list.c:1923
+#: ../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
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3188
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3226
+#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
 msgid "Cancel _Drag"
 msgstr "Otkaži _prevlačenje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:824
 msgid "Could not update object"
 msgstr "Nije moguće osvežiti objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2577
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6010,102 +5988,97 @@ msgstr[0] "<b>%d</b> prilog"
 msgstr[1] "<b>%d</b> priloga"
 msgstr[2] "<b>%d</b> priloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1003
 msgid "Hide Attachment _Bar"
 msgstr "Sakrij liniju pri_loga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1530
+#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1542
 msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/event-page.c:1898
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3693
+#: ../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
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3694 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../composer/e-msg-composer.c:3742 ../mail/em-folder-tree.c:2129
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
 msgid "_Properties"
 msgstr "O_sobine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3696
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../composer/e-msg-composer.c:3744
 msgid "_Add attachment..."
 msgstr "_Dodaj prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1554
-#: ../mail/em-format-html-display.c:2300
+#: ../calendar/gui/dialogs/comp-editor.c:1566
+#: ../mail/em-format-html-display.c:2318
 msgid "Show Attachments"
 msgstr "Prikaži p_riloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1555
+#: ../calendar/gui/dialogs/comp-editor.c:1567
 msgid "Press space key to toggle attachment bar"
 msgstr "Pritisnite razmak za prikaz(sakrivanje) linije priloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2162
-#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2173
+#: ../calendar/gui/dialogs/comp-editor.c:2216
 msgid "Edit Appointment"
 msgstr "Uredi zakazani sastanak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2168
-#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../calendar/gui/dialogs/comp-editor.c:2179
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2181
+#: ../calendar/gui/dialogs/comp-editor.c:2224
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2174
-#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2185
+#: ../calendar/gui/dialogs/comp-editor.c:2228
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljeno zaduženje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2187
+#: ../calendar/gui/dialogs/comp-editor.c:2230
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../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"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../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:2777
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:406
-#: ../mail/em-utils.c:438 ../widgets/misc/e-attachment-bar.c:350
+#: ../calendar/gui/dialogs/comp-editor.c:2789 ../mail/em-utils.c:370
+#: ../widgets/misc/e-attachment-bar.c:350
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
-#: ../calendar/gui/dialogs/comp-editor.c:2920
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2878
+#: ../calendar/gui/dialogs/comp-editor.c:2932
+#: ../calendar/gui/dialogs/comp-editor.c:2956
 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:2968
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "Nije moguće korišćenje tekuće verzije!"
 
@@ -6186,21 +6159,21 @@ msgstr "Delegiraj:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: ../calendar/gui/dialogs/event-editor.c:604
+#: ../calendar/gui/dialogs/event-editor.c:601
 msgid "Appoint_ment"
 msgstr "Zaka_zani sastanak"
 
-#: ../calendar/gui/dialogs/event-editor.c:608
+#: ../calendar/gui/dialogs/event-editor.c:605
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Učestalost"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2719
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.c:2734
 msgid "This event has alarms"
 msgstr "Za ovaj događaj je navijen sat"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:895
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6208,68 +6181,68 @@ msgstr "Za ovaj događaj je navijen sat"
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:935
 msgid "Atte_ndees"
 msgstr "Uč_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1100
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1103
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
+#: ../calendar/gui/dialogs/event-page.c:1272
 #: ../calendar/gui/dialogs/memo-page.c:685
 #: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "Datum početka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1282
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1456
+#: ../calendar/gui/dialogs/event-page.c:1469
 #: ../calendar/gui/dialogs/memo-page.c:720
 #: ../calendar/gui/dialogs/task-page.c:906
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: ../calendar/gui/dialogs/event-page.c:1462
+#: ../calendar/gui/dialogs/event-page.c:1475
 #: ../calendar/gui/dialogs/memo-page.c:726
 #: ../calendar/gui/dialogs/task-page.c:912
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1477
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/task-page.c:927
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1899
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1914
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Dodaj "
 
-#: ../calendar/gui/dialogs/event-page.c:2626
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvaranje kalendara ’%s‘."
 
-#: ../calendar/gui/dialogs/event-page.c:2932
+#: ../calendar/gui/dialogs/event-page.c:2947
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6277,7 +6250,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:2938
+#: ../calendar/gui/dialogs/event-page.c:2953
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6285,7 +6258,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:2944
+#: ../calendar/gui/dialogs/event-page.c:2959
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6293,7 +6266,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:2957
+#: ../calendar/gui/dialogs/event-page.c:2972
 msgid "Customize"
 msgstr "Prilagodi"
 
@@ -6303,19 +6276,20 @@ 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:2962
+#: ../calendar/gui/dialogs/event-page.c:2977
 #: ../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:2318
-#: ../filter/filter-rule.c:890 ../mail/em-account-editor.c:701
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2361
+#: ../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
 #: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../plugins/itip-formatter/itip-formatter.c:1910
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1718
 msgid "None"
 msgstr "Ništa"
 
@@ -6345,7 +6319,6 @@ msgid "Custom Alarm:"
 msgstr "Prilagođen zvuk alarma:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Opis:"
 
@@ -6382,56 +6355,6 @@ msgstr "za"
 msgid "until"
 msgstr "do"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "_Učesnik"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Kliknite ovde da dodate učesnika"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Zajedničko ime"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegirao"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegirano"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jezik"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Član"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Status"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>Učesni_ci</b>"
@@ -6453,18 +6376,18 @@ msgstr "Organizator"
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2452
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:868
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nije moguće otvaranje beleški u „%s“."
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../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
 msgid "To"
 msgstr "Prima"
 
@@ -6487,42 +6410,6 @@ msgstr "_Opis:"
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Opcije kalendara</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Grupa kalendara"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Mesto kalendara"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Ime kalendara"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>Opcije liste zaduženja</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Dodaj novu listu zaduženja"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Grupa za liste zaduženja"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Ime liste zaduženja"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Menjate povratni događaj, šta želite da izmenite?"
@@ -6541,19 +6428,19 @@ msgid ""
 "You are modifying a recurring journal entry. What would you like to modify?"
 msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Ovaj i buduće unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Sve unose"
 
@@ -6661,23 +6548,23 @@ msgstr "na"
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2157
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2200
 msgid "Could not get a selection to modify."
 msgstr "Ne može da nađe izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2206
 msgid "Modify exception"
 msgstr "Izmeni izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2252
 msgid "Could not get a selection to delete."
 msgstr "Ne može da nađe izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -6733,7 +6620,7 @@ msgstr "godina(e)"
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
 msgid "Web Page"
 msgstr "Veb strana"
 
@@ -6749,48 +6636,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:231
+#: ../calendar/gui/e-cal-component-preview.c:233
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-calendar-table.c:463 ../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:2513 ../plugins/save-calendar/csv-format.c:390
+#: ../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:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:388 ../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:228
+#: ../calendar/gui/e-cal-component-preview.c:230
 #: ../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:461 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-table.c:462 ../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:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-calendar-table.c:390 ../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:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
 #: ../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:238
+#: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
 msgid "Not Started"
 msgstr "Nije započeto"
 
@@ -6803,7 +6690,7 @@ msgid "Stat_us:"
 msgstr "_Stanje:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "Undefined"
 msgstr "Neodređena"
 
@@ -6820,12 +6707,12 @@ msgstr "_Važnost:"
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:424
+#: ../calendar/gui/tasks-component.c:1250
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:428
 msgid "Task Details"
 msgstr "Detalji zaduženja"
 
@@ -6846,6 +6733,11 @@ msgstr "Uč_esnici..."
 msgid "Categor_ies..."
 msgstr "Ka_tegorije..."
 
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "De_scription:"
+msgstr "Opis:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "Or_ganizator:"
@@ -6858,49 +6750,6 @@ msgstr "Vremenska zona:"
 msgid "_Due date:"
 msgstr "Datum _za završetak:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>K_alendari za slobodno/zauzeto</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Učestalost objavljivanja</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Mesto objavljivanja</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Podešavanja objavljivanja slobodno/zauzeto"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Dnevno"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Ručno"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Lozinka:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "_Zapamti lozinku"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "_Korisničko ime:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "_Nedeljno"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6979,72 +6828,72 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2913
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3000
 #, c-format
 msgid "Click to open %s"
 msgstr "Pritisnite da otvorite %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:157
+#: ../calendar/gui/e-cal-component-preview.c:157 ../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:206
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../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
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:219
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-memo-preview.c:221
+#: ../calendar/gui/e-cal-component-preview.c:271
 #: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:252
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:254
+#: ../calendar/gui/e-cal-component-preview.c:304
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-cal-component-preview.c:190
 #: ../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:217
+#: ../calendar/gui/e-cal-component-preview.c:219
 msgid "Due Date:"
 msgstr "Datum za završetak:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:226
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:250
 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:365
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 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:366
+#: ../calendar/gui/e-calendar-table.c:367
 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:367
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "Poverljivo"
 
@@ -7065,12 +6914,12 @@ msgid "Summary"
 msgstr "Pregled"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:440
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:441
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Zauzeto"
@@ -7107,12 +6956,12 @@ msgstr "Ne"
 #: ../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:1213
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../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
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -7124,27 +6973,27 @@ msgstr "Ponovno"
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:422
 msgid "Save As..."
 msgstr "Sačuvaj kao..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2146
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2163
 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:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:447
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1144 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../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
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:565
+#: ../mail/em-popup.c:576
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
@@ -7152,84 +7001,84 @@ msgstr "Postavi kao _pozadinu"
 msgid "_Save Selected"
 msgstr "_Sačuvaj izabrano"
 
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:786
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
 msgid "Deleting selected objects"
 msgstr "Brisanje izabranih objekata"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:958
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
 msgid "Updating objects"
 msgstr "Osvežavanje objekata"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1351
+#: ../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
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Task"
 msgstr "Novo zad_uženje"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1145
+#: ../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
 #: ../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
@@ -7237,52 +7086,52 @@ msgstr "Otvori _Veb stranicu"
 msgid "_Print..."
 msgstr "Štam_paj..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
 #: ../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:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../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
 #: ../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:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iKalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1297
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1298
 msgid "_Mark as Incomplete"
 msgstr "_Obeleži kao nezavršeno"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1299
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Obeleži izabrana zaduženja kao nezavršena"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1304
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1537
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite za novo zaduženje"
@@ -7292,7 +7141,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:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:698
 msgid "Complete"
 msgstr "Završeno"
 
@@ -7313,105 +7162,112 @@ msgstr "Važnost"
 msgid "Start date"
 msgstr "Datum početka"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:16
+msgid "Status"
+msgstr "Status"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Razvrstavanje zaduženja"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Moving items"
 msgstr "Premeštanje predmeta"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1350
 msgid "Copying items"
 msgstr "Umnožavanje predmeta"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Appointment..."
 msgstr "Novi _sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New _Meeting"
 msgstr "Novi _sastanak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "_Current View"
 msgstr "_Trenutni pregled"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1674
 msgid "Select T_oday"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "_Select Date..."
 msgstr "_Izaberi datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Reply"
 msgstr "O_dgovori"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1139
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1147
+#: ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1704
 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:2175
+#: ../calendar/gui/e-calendar-view.c:2165
 #, 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:2179
+#: ../calendar/gui/e-calendar-view.c:2169
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2481
+#: ../calendar/gui/e-calendar-view.c:2185 ../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:2226
+#: ../calendar/gui/e-calendar-view.c:2216
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -7434,11 +7290,10 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 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:124
-#, c-format
+#: ../calendar/gui/e-cell-date-edit-text.c:127
+#, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Datum mora biti unet u obliku: \n"
@@ -7468,19 +7323,19 @@ msgstr "%02i minutni razmaci"
 #: ../calendar/gui/e-day-view-top-item.c:1311
 #: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1643
+#: ../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:952
+#: ../calendar/gui/e-week-view.c:503 ../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:954
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
 msgid "pm"
 msgstr "pm"
 
@@ -7612,12 +7467,12 @@ msgstr "iKalendar greška"
 
 #: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
 #: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
@@ -7632,21 +7487,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:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/itip-utils.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:1923
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 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:693 ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/itip-utils.c:808 ../calendar/gui/itip-utils.c:837
+#: ../plugins/itip-formatter/itip-formatter.c:1929
 msgid "Declined"
 msgstr "Odbijeno"
 
@@ -7660,8 +7515,7 @@ msgstr "Sastanak je otkazan, međutim nije ga moguće naći u Vašim kalendarima
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
-"Zaduženje je otkazano, međutim nije ga moguće naći u Vašim spiskovima "
-"zaduženja"
+"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
 #, c-format
@@ -7844,75 +7698,74 @@ msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema predmete kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1944
 msgid "Update complete\n"
 msgstr "Osvežavanje završeno\n"
 
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1977
 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:1974
+#: ../calendar/gui/e-itip-control.c:1994
 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:1986
+#: ../calendar/gui/e-itip-control.c:2012
 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:2003
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status updated\n"
 msgstr "Osvežen status učesnika\n"
 
-#: ../calendar/gui/e-itip-control.c:2006
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:1228
 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:2030 ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
 msgid "Item sent!\n"
 msgstr "Predmet poslat!\n"
 
-#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Predmet nije mogao biti poslat!\n"
 
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2223
 msgid "Choose an action:"
 msgstr "Izaberite radnju:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Update"
 msgstr "Osveži"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2324
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2325
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2326
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2355
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodno/zauzeto podatak"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2383
 msgid "Update respondent status"
 msgstr "Osveži status sagovornika"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2411
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviji podatak"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:825
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Poništi"
@@ -8019,8 +7872,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:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/itip-utils.c:811
+#: ../plugins/itip-formatter/itip-formatter.c:1932
 msgid "Delegated"
 msgstr "Delegirano"
 
@@ -8029,6 +7882,12 @@ msgstr "Delegirano"
 msgid "Attendee                          "
 msgstr "Učesnik"
 
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "U toku"
@@ -8037,7 +7896,7 @@ msgstr "U toku"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel.c:2116
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -8051,7 +7910,7 @@ msgstr "%A, %d %B , %Y."
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel.c:2149
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y."
 
@@ -8066,7 +7925,7 @@ msgstr "%a %d/%m/%Y."
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
@@ -8074,67 +7933,95 @@ msgstr "Van kancelarije"
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "A_ttendees..."
 msgstr "Uč_esnici..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:449
 msgid "O_ptions"
 msgstr "O_pcije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:466
 msgid "Show _only working hours"
 msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "Show _zoomed out"
 msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_Update free/busy"
 msgstr "_Osveži slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:506
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:556
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:583
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Start time:"
 msgstr "_Vreme početka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:646
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "_Učesnik"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Kliknite ovde da dodate učesnika"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Zajedničko ime"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegirao"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegirano"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Jezik"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Član"
+
+#: ../calendar/gui/e-memo-table.c:920
 msgid "_Delete Selected Memos"
 msgstr "_Obriši izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pritisnite da dodate belešku"
 
@@ -8142,8 +8029,8 @@ msgstr "Pritisnite da dodate belešku"
 msgid "Memo sort"
 msgstr "Razvrstavanje beleški"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2771
+#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
+#: ../calendar/gui/gnome-cal.c:2828
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8152,38 +8039,33 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:781
 msgid "Loading memos"
 msgstr "Učitavanje beleški je u toku"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:862
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Otvaranje beleški sa %s je u toku"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1035 ../calendar/gui/e-tasks.c:1249
 msgid "Deleting selected objects..."
 msgstr "Brisanje izabranih objekata..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Unesite lozinku za %s"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:894
 msgid "Loading tasks"
 msgstr "Učitavanje zaduženja"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:981
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaranje zaduženja u %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1226
 msgid "Completing tasks..."
 msgstr "Završavanje zaduženja..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1276
 msgid "Expunging"
 msgstr "Izbacivanje"
 
@@ -8197,47 +8079,47 @@ msgstr "Izaberite vremensku zonu"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1624
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:824
 msgid "Updating query"
 msgstr "Osvežavanje upita"
 
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2479
 msgid "_Custom View"
 msgstr "Pr_ilagođen pregled"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2480
 msgid "_Save Custom View"
 msgstr "Sačuvaj prilagođen preg_led"
 
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2485
 msgid "_Define Views..."
 msgstr "Odre_di preglede..."
 
-#: ../calendar/gui/gnome-cal.c:2600
+#: ../calendar/gui/gnome-cal.c:2651
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavanje sastanaka sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2619
+#: ../calendar/gui/gnome-cal.c:2670
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavanje zaduženja sa %s"
 
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2679
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Učitavanje beleški na %s"
 
-#: ../calendar/gui/gnome-cal.c:2736
+#: ../calendar/gui/gnome-cal.c:2787
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaranje %s"
 
-#: ../calendar/gui/gnome-cal.c:3664
+#: ../calendar/gui/gnome-cal.c:3726
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -8297,65 +8179,65 @@ msgstr "Septembar"
 msgid "_Select Today"
 msgstr "_Izaberi današnji dan"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:523 ../calendar/gui/itip-utils.c:572
+#: ../calendar/gui/itip-utils.c:678
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:559
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:887
 msgid "Event information"
 msgstr "Podatak o događaju"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:766 ../calendar/gui/itip-utils.c:889
 msgid "Task information"
 msgstr "Podatak o zaduženju"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:768 ../calendar/gui/itip-utils.c:891
 msgid "Journal information"
 msgstr "Podatak o dnevniku"
 
-#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:909
 msgid "Free/Busy information"
 msgstr "Slobodno/zauzeto podatak"
 
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:772
 msgid "Calendar information"
 msgstr "Podatak o kalendaru"
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:821
 msgid "Updated"
 msgstr "Osveženo"
 
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:829
 msgid "Refresh"
 msgstr "Osveži"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:833
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:905
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodno/zauzeto vreme (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:915
 msgid "iCalendar information"
 msgstr "iKalendar podatak"
 
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:1082
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:456
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:532
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8363,8 +8245,7 @@ msgstr[0] "%d beleška"
 msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
-#: ../mail/mail-component.c:562
+#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8372,61 +8253,61 @@ msgstr[0] ", %d izabrano"
 msgstr[1] "%d izabrana"
 msgstr[2] "%d izabranih"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:581
 msgid "Failed upgrading memos."
 msgstr "Neuspela dopuna beleški."
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:879
 #, 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:887
+#: ../calendar/gui/memos-component.c:892
 msgid "There is no calendar available for creating memos"
 msgstr "Nijedan kalendar nije dostupan za pravljenje beleški"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:988
 msgid "Memo Source Selector"
 msgstr "Birač izvora beleški"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1171
 msgid "New memo"
 msgstr "Nova beleška"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1172
 msgid "Mem_o"
 msgstr "_Beleška"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1173
 msgid "Create a new memo"
 msgstr "Napiši jednu novu belešku"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1179
 msgid "New shared memo"
 msgstr "Nova deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1180
 msgid "_Shared memo"
 msgstr "_Deljena beleška"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1181
 msgid "Create a shared new memo"
 msgstr "Napravi nobu deljenu belešku"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1187
 msgid "New memo list"
 msgstr "Novi spisak beleški"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1188
 msgid "Memo li_st"
 msgstr "Spi_sak beleški"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1189
 msgid "Create a new memo list"
 msgstr "Sastavi novi spisak beleški"
 
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
@@ -8437,8 +8318,8 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Mesto i hijerarhija fascikli zaduženja u Evoluciji je izmenjena od Evolucije "
-"1.h.\n"
+"Mesto i hijerarhija fascikli zaduženja u Evoluciji je izmenjena od Evolucije 1."
+"h.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
@@ -8455,266 +8336,235 @@ msgstr ""
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Nije moguć prenos starih podešavanja iz evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:809
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Nije moguć prenos kalendara ’%s‘"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nije moguć prenos zaduženja ’%s‘"
 
-#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:404
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:435
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:548
+#: ../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
 msgid "Notes"
 msgstr "Napomene"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:519
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:594
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
 msgid "Th"
 msgstr "Če"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
 msgid "Sa"
 msgstr "Su"
 
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Izabrani dan (%a, %d. %b %Y.)"
-
-#: ../calendar/gui/print.c:2072 ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%a, %d. %b"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%a, %d. %Y."
-
-#: ../calendar/gui/print.c:2077 ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%a, %d. %b %Y."
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Izabrana nedelja (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "Izabrani mesec (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "Izabrana godina (%Y)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2283
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2285
 msgid "Task"
 msgstr "Zaduženje"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2307
 #, c-format
 msgid "Summary: %s"
 msgstr "Pregled: %s"
 
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2358
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2375
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2387
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2399
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakti: "
 
-#: ../calendar/gui/print.c:2654 ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "Štampaj predmet"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2524
+#, fuzzy
+msgid "Upcoming Appointments"
+msgstr "_Otvori sastanak"
 
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:447
 msgid "_New Task List"
 msgstr "No_vi spisak zaduženja"
 
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:523
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8722,57 +8572,57 @@ msgstr[0] "%d zaduženje"
 msgstr[1] "%d zaduženja"
 msgstr[2] "%d zaduženja"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:572
 msgid "Failed upgrading tasks."
 msgstr "Neuspela dopuna zaduženja."
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:883
 #, 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:891
+#: ../calendar/gui/tasks-component.c:896
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za pravljenje zaduženja"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:993
 msgid "Task Source Selector"
 msgstr "Birač izvora zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1249
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1251
 msgid "Create a new task"
 msgstr "Napravi novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1257
 msgid "New assigned task"
 msgstr "Novo dodeljeno zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1258
 msgid "Assigne_d Task"
 msgstr "_Dodeljeno zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1259
 msgid "Create a new assigned task"
 msgstr "Dodeli novo zaduženje"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1265
 msgid "New task list"
 msgstr "Nova lista zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Tas_k list"
 msgstr "_Lista zaduženja"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1267
 msgid "Create a new task list"
 msgstr "Sastavi novu listu zaduženja"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8784,11 +8634,11 @@ msgstr ""
 "\n"
 "Zaista obrisati ova zaduženja?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
 msgid "Print Tasks"
 msgstr "Štampaj zaduženja"
 
@@ -10366,58 +10216,6 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "Linija priloga"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Nije moguće prilaganje datoteke %s: %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Nije moguće prilaganje datoteke %s: nije regularna datoteka"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Osobine priloga"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Ime datoteke:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME tip:"
-
 #: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "Odredišna pošta"
@@ -10426,7 +10224,7 @@ msgstr "Odredišna pošta"
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:602
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za imenik."
 
@@ -10441,45 +10239,45 @@ msgstr "Kliknite ovde za imenik."
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:634
 msgid "_Reply-To:"
 msgstr "_Odgovor:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:641
 msgid "Fr_om:"
 msgstr "Š_alje:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:648
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:657
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:661
 msgid "_Cc:"
 msgstr "_Kopija (Cc):"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:662
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje će primiti kopiju (cc) poruke"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:665
 msgid "_Bcc:"
 msgstr "_Nevidljiva kopija (Bcc):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:666
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10490,15 +10288,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:673
 msgid "_Post To:"
 msgstr "S_lanje na:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:678
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:683
 msgid "Post To:"
 msgstr "Slanje na:"
 
@@ -10510,14 +10308,14 @@ msgstr "Pri_loži"
 msgid "Insert Attachment"
 msgstr "Umetni prilog"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:834
 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:837
+#: ../composer/e-msg-composer.c:841
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10525,52 +10323,52 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljen sertifikat za "
 "šifrovanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1344 ../composer/e-msg-composer.c:2606
 msgid "Hide _Attachment Bar"
 msgstr "Sakrij li_niju priloga"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3939
+#: ../composer/e-msg-composer.c:1347 ../composer/e-msg-composer.c:2609
+#: ../composer/e-msg-composer.c:3987
 msgid "Show _Attachment Bar"
 msgstr "Prikaži lini_ju priloga"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1379 ../composer/e-msg-composer.c:1413
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1451
 msgid "Could not open file"
 msgstr "Nije moguće otvaranje datoteke"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1459
 msgid "Unable to retrieve message from editor"
 msgstr "Nije moguće vratiti poruku iz uređivača"
 
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1744
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1779
 msgid "Open File"
 msgstr "Otvara datoteku"
 
-#: ../composer/e-msg-composer.c:2198 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2241 ../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:2301
+#: ../composer/e-msg-composer.c:2344
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3821
-#: ../composer/e-msg-composer.c:3824
+#: ../composer/e-msg-composer.c:2620 ../composer/e-msg-composer.c:3869
+#: ../composer/e-msg-composer.c:3872
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:5048
+#: ../composer/e-msg-composer.c:5097
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10582,8 +10380,8 @@ msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
 msgstr ""
-" Preuzima se nekoliko priloga. Ukoliko sada pošaljete poruku ovi prilozi "
-"neće biti poslati sa njom "
+" Preuzima se nekoliko priloga. Ukoliko sada pošaljete poruku ovi prilozi neće "
+"biti poslati sa njom "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -10593,8 +10391,7 @@ msgstr "Svi nalozi su uklonjeni."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
-"Sigurno želite da odbacite poruku, naslovljenu ’{0}‘, koju sastavljate?"
+msgstr "Sigurno želite da odbacite poruku, naslovljenu ’{0}‘, koju sastavljate?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -10616,8 +10413,8 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"Zatvaranjem ovog prozora za sastavljanje ćete trajno odbaciti poruku, osim "
-"ako odlučite da sačuvate poruku u fasciklu Priprema. Ovo će Vam omogućiti da "
+"Zatvaranjem ovog prozora za sastavljanje ćete trajno odbaciti poruku, osim ako "
+"odlučite da sačuvate poruku u fasciklu Priprema. Ovo će Vam omogućiti da "
 "nastavite poruku kasnije."
 
 # mail-composer:no-editor-control primary
@@ -10662,8 +10459,8 @@ msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Evolucija je neočekivano završila tokom pisanja nove poruke. Spašavanje "
-"poruke će Vam omogućiti da nastavite gde ste stali."
+"Evolucija je neočekivano završila tokom pisanja nove poruke. Spašavanje poruke "
+"će Vam omogućiti da nastavite gde ste stali."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -10734,14 +10531,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:523
+#: ../shell/main.c:510
 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:574
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:593
 msgid "Groupware Suite"
 msgstr "Pošaljite elektronsku poštu prijateljima i poslovnim saradnicima"
 
@@ -10757,112 +10554,6 @@ msgstr "karta imenika"
 msgid "calendar information"
 msgstr "podatak kalendara"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Trenutno, Vaš status je „Nisam u kancelariji“. </b>\n"
-"\n"
-"Želite li da promenite status u „U kancelariji“? "
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Poruka kada niste u kancelariji:</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Dole izabrana poruka će biti automatski poslata svakoj osobi koja Vam "
-"pošalje\n"
-"poštu dok niste u kancelariji.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Trenutno sam u kancelariji"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Trenutno nisam u kancelariji"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "Ne, ne menjaj stanje"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Pomoćnik nije u kacelariji"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Da, promeni status"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Primanje pošte</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Slanje pošte:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>Ova strana dozvoljava da izaberete da li želite da pošaljete "
-"priznanicu uz svoju\n"
-"poruku radi obaveštenja kada bude pročitana, i da odredite šta Evolucija da "
-"radi kada neko Vama pošalje priznanicu.</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "Uvek vrati priznanicu"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Pitaj me želim li da vratim priznanicu"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "Nikada ne vraćaj priznanicu"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "Priznanice"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "Zatraži povraćaj priznanice za sve poruke koje pošaljem"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "Osim ako je poruka poslata dopisnoj listi, a ne meni lično"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "Kada primite poruku sa priznanicom, šta Evolucija da radi?"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Greška Evolucije"
@@ -10886,6 +10577,19 @@ 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
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:143
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:149
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "Nije moguće otvaranje datoteke &quot;{0}&quot;."
@@ -10906,15 +10610,11 @@ 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:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "Položaj zone."
-
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10922,7 +10622,15 @@ msgstr[0] "pre %d sekunde"
 msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10930,7 +10638,15 @@ msgstr[0] "pre %d minut"
 msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10938,7 +10654,15 @@ msgstr[0] "pre %d sat"
 msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10946,7 +10670,15 @@ msgstr[0] "pre %d dan"
 msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, fuzzy, 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"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10954,7 +10686,15 @@ msgstr[0] "pre %d nedelju"
 msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10962,7 +10702,15 @@ msgstr[0] "pre %d mesec"
 msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, fuzzy, 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"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10970,20 +10718,29 @@ msgstr[0] "pre %d godinu"
 msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, fuzzy, 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"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:449
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poređenje"
 
@@ -10991,20 +10748,20 @@ msgstr "Izaberite vreme za poređenje"
 msgid "Choose a file"
 msgstr "Izaberite datoteku"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:147
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:149
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
+#: ../mail/mail-config.glade.h:98
 msgid "Later"
 msgstr "Kasnije"
 
@@ -11012,52 +10769,53 @@ msgstr "Kasnije"
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:799
+#: ../filter/filter-rule.c:800
 msgid "_Search name:"
 msgstr "Osnova za _pretragu:"
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "Pronađi stavke koje zadovoljavaju sledeće uslove"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:867
 msgid "If all criteria are met"
 msgstr "ako su svi uslovi zadovoljeni"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:867
 msgid "If any criteria are met"
 msgstr "ako je bilo koji uslov zadovoljen"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:869
 msgid "_Find items:"
 msgstr "_Pronađi predmete:"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
+#: ../filter/filter-rule.c:893
+#, fuzzy
+msgid "I_nclude threads"
 msgstr "Uključi niti"
 
-#: ../filter/filter-rule.c:987 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:989 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:307
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../filter/filter-rule.c:987 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:989 ../mail/em-utils.c:308
 msgid "Outgoing"
 msgstr "Odlazno"
 
@@ -11082,7 +10840,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:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -11151,36 +10909,45 @@ msgstr "vreme u odnosu na trenutno vreme"
 msgid "ago"
 msgstr "pre"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:181
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:186
 msgid "seconds"
 msgstr "sekunde"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "trenutno vreme"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "vreme koje odredite"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "weeks"
+msgstr "nedelje"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "godine"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "Ime pravila"
 
@@ -11226,11 +10993,10 @@ 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:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:580
-#: ../mail/mail-component.c:581 ../mail/mail-component.c:722
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:529
+#: ../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
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
@@ -11241,7 +11007,7 @@ msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
@@ -11268,7 +11034,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:511
+#: ../mail/em-vfolder-rule.c:510
 msgid "Select Folder"
 msgstr "Izaberite fasciklu"
 
@@ -11280,7 +11046,7 @@ msgstr "Pitaj za svaku poruku"
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
@@ -11288,7 +11054,7 @@ msgstr "Primanje pošte"
 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:131
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:133
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
@@ -11297,7 +11063,7 @@ msgid "Defaults"
 msgstr "Podrazumevano"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:127
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sigurnost"
@@ -11315,19 +11081,21 @@ msgstr "Provera za nove poruke"
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:81
 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
-msgid "Disable"
+#, fuzzy
+msgid "Di_sable"
 msgstr "Onemogući"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "Omogući"
+#: ../mail/em-account-prefs.c:411 ../mail/mail-config.glade.h:75
+#: ../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
@@ -11335,9 +11103,8 @@ msgid "[Default]"
 msgstr "[Podrazumevano]"
 
 # has "activatable" set.
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../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
 msgid "Enabled"
 msgstr "Omogućeno"
@@ -11350,28 +11117,28 @@ msgstr "Ime naloga"
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:1033
+#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
+#: ../mail/mail-config.c:1029
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:955
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:998
 msgid "Add signature script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1018
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:396
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1692
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
@@ -11380,7 +11147,7 @@ msgstr "nepoznati pošiljalac"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1739
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11388,6 +11155,11 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
+#: ../mail/em-composer-utils.c:1880
+#, fuzzy
+msgid "-----Original Message-----"
+msgstr "-------- Prosleđena poruka --------"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "Pr_avila filtera"
@@ -11525,7 +11297,7 @@ msgstr "nije"
 msgid "is not Flagged"
 msgstr "nije označeno"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:95
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
@@ -11642,9 +11414,9 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1661
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../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-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:6
 #: ../smime/lib/e-cert.c:1132
@@ -11660,75 +11432,75 @@ msgstr "Nepostavljen status"
 msgid "<b>Then</b>"
 msgstr "<b>Onda</b>"
 
-#: ../mail/em-folder-browser.c:168
+#: ../mail/em-folder-browser.c:170
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "All Messages"
 msgstr "Sve poruke"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:193
 msgid "Unread Messages"
 msgstr "Nepročitanih poruka:"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:195
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../mail/em-folder-browser.c:200
+#: ../mail/em-folder-browser.c:202
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:203
 msgid "Recent Messages"
 msgstr "Skorašnje poruke"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:204
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:205
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:206
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:207
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../mail/em-folder-browser.c:1028
+#: ../mail/em-folder-browser.c:1025
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../mail/em-folder-browser.c:1072
+#: ../mail/em-folder-browser.c:1069
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
+# bug: no need for plural-forms
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Nepročitanih poruka:"
+msgstr[1] "Nepročitanih poruka:"
+msgstr[2] "Nepročitanih poruka:"
+
 # bug: no need for plural-forms here, since text is in front of number
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
 msgstr[1] "Ukupno poruka:"
 msgstr[2] "Ukupno poruka:"
 
-# bug: no need for plural-forms
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "Nepročitanih poruka:"
-msgstr[1] "Nepročitanih poruka:"
-msgstr[2] "Nepročitanih poruka:"
-
-#: ../mail/em-folder-properties.c:316
+#: ../mail/em-folder-properties.c:323
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
@@ -11760,8 +11532,9 @@ msgid "Drafts"
 msgstr "Priprema"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2462
+#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Sanduče"
 
@@ -11792,82 +11565,92 @@ msgstr "Učitavanje..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:369
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:721
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:881
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštanje fascikle %s"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:883
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavanje fascikle %s"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:890 ../mail/message-list.c:1867
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštanje poruka u fasciklu %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:892 ../mail/message-list.c:1869
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavanje poruka u fasciklu %s"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:908
 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:1000 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Umnoži u fasciklu"
 
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1005 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Premesti u fasciklu"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretraga fascikli u „%s“"
 
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2110 ../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:58 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "P_regled"
 
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2111
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
-#: ../mail/em-folder-tree.c:2070
+#: ../mail/em-folder-tree.c:2115
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../mail/em-folder-tree.c:2071
+#: ../mail/em-folder-tree.c:2116
 msgid "_Move..."
 msgstr "_Premesti..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2120
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2124
+#, fuzzy
+msgid "Re_fresh"
+msgstr "Osveži"
+
+#: ../mail/em-folder-tree.c:2125
+#, fuzzy
+msgid "Fl_ush Outbox"
+msgstr "Za slanje"
+
+#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:136
 msgid "_Empty Trash"
 msgstr "Isprazni _smeće"
 
@@ -11876,14 +11659,13 @@ msgstr "Isprazni _smeće"
 msgid "Copying `%s' to `%s'"
 msgstr "Umnožavanje ’%s‘ u ’%s‘"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1030
-#: ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1038
+#: ../mail/em-folder-view.c:1053
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1053
 msgid "C_opy"
 msgstr "_Umnoži"
 
@@ -11905,68 +11687,69 @@ msgstr "Napravi fasciklu"
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-folder-view.c:966 ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:974 ../mail/mail.error.xml.h:68
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:975 ../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:1138 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1146 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/em-folder-view.c:1140 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1148 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/em-folder-view.c:1143 ../ui/evolution-mail-message.xml.h:107
+#. 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
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1158
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1159
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1160
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1163
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1164
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1165
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1166
 msgid "Mark as Un_important"
 msgstr "_Označi kao nevažno"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1167
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1168
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1169
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1171
 msgid "_Label"
 msgstr "Nat_pis"
 
@@ -11977,87 +11760,95 @@ 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:1163 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1172 ../widgets/misc/e-dateedit.c:473
 msgid "_None"
 msgstr "Ništ_a"
 
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1177
 msgid "Fla_g Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1178
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1181
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: ../mail/em-folder-view.c:1173
+#: ../mail/em-folder-view.c:1182
 msgid "Search Folder from _Subject"
 msgstr "Fascikla pretrage na _naslov"
 
-#: ../mail/em-folder-view.c:1174
+#: ../mail/em-folder-view.c:1183
 msgid "Search Folder from Se_nder"
 msgstr "Fascikla pretrage na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1184
 msgid "Search Folder from _Recipients"
 msgstr "Fascikla pretrage na _primaoce"
 
-#: ../mail/em-folder-view.c:1176
+#: ../mail/em-folder-view.c:1185
 msgid "Search Folder from Mailing _List"
 msgstr "Fascikla pretrage na dopisnu _listu"
 
-#: ../mail/em-folder-view.c:1180
+#: ../mail/em-folder-view.c:1189
 msgid "Filter on Sub_ject"
 msgstr "Filter na naslo_v"
 
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1190
 msgid "Filter on Sen_der"
 msgstr "Filter na p_ošiljaoca"
 
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1191
 msgid "Filter on Re_cipients"
 msgstr "Filter na p_rimaoce"
 
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1192
 msgid "Filter on _Mailing List"
 msgstr "Filter na _dopisnu listu"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2036 ../mail/em-folder-view.c:2080
+#: ../mail/em-folder-view.c:2099 ../mail/em-folder-view.c:2143
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../mail/em-folder-view.c:2185 ../mail/em-folder-view.c:2190
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "Štampaj poruku"
-
-#: ../mail/em-folder-view.c:2349
+#: ../mail/em-folder-view.c:2356
 msgid "Unable to retrieve message"
 msgstr "Nije moguće dobiti poruku"
 
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2377
+#, fuzzy
+msgid "<b>Retrieving Message...</b>"
+msgstr "Dovlačenje poruke %s"
+
+#: ../mail/em-folder-view.c:2601
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2604
 msgid "Create _Search Folder"
 msgstr "Napravi Fasciklu _pretrage"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2605
 msgid "_From this Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2606
 msgid "_To this Address"
 msgstr "_na ovu adresu"
 
-#: ../mail/em-folder-view.c:2906
+#: ../mail/em-folder-view.c:2981
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: ../mail/em-folder-view.c:2911
+#: ../mail/em-folder-view.c:2993
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Kliknite da pošaljete %s"
+
+#: ../mail/em-folder-view.c:2998
 msgid "Click to hide/unhide addresses"
 msgstr "Pritisni da sakriješ/otkirješ adresu"
 
@@ -12085,7 +11876,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:619
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:632
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
@@ -12095,7 +11886,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:620
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:633
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
@@ -12107,7 +11898,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:621
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:634
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
@@ -12130,7 +11921,7 @@ 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:628
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:641
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
@@ -12142,7 +11933,7 @@ 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:629
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:642
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
@@ -12155,7 +11946,7 @@ 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:630
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:643
 msgid "Encrypted"
 msgstr "Šifrovano"
 
@@ -12166,7 +11957,7 @@ msgid ""
 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:631
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:644
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
@@ -12215,21 +12006,27 @@ msgstr "_Prilagodi na širinu"
 msgid "Show _Original Size"
 msgstr "Prikaži _originalnu veličinu"
 
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2505
+#: ../mail/em-format-html-display.c:1903 ../mail/em-format-html-display.c:2514
 #: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Prilog"
 
-#: ../mail/em-format-html-display.c:2107
-msgid "Select folder to save all attachments..."
+#: ../mail/em-format-html-display.c:2117
+#, fuzzy
+msgid "Save attachment as"
+msgstr "Sačuvaj priloge"
+
+#: ../mail/em-format-html-display.c:2121
+#, fuzzy
+msgid "Select folder to save all attachments"
 msgstr "Izaberite fasciklu za čuvanje svih priloga..."
 
-#: ../mail/em-format-html-display.c:2154
+#: ../mail/em-format-html-display.c:2172
 msgid "_Save Selected..."
 msgstr "Izabrano čuvanje..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2221
+#: ../mail/em-format-html-display.c:2239
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12237,31 +12034,31 @@ msgstr[0] "%d pri_log"
 msgstr[1] "%d pri_loga"
 msgstr[2] "%d pri_loga"
 
-#: ../mail/em-format-html-display.c:2228 ../mail/em-format-html-display.c:2306
+#: ../mail/em-format-html-display.c:2246 ../mail/em-format-html-display.c:2324
 msgid "S_ave"
 msgstr "_Sačuvaj"
 
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2257
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2320
 msgid "No Attachment"
 msgstr "Nema priloga"
 
-#: ../mail/em-format-html-display.c:2433 ../mail/em-format-html-display.c:2478
+#: ../mail/em-format-html-display.c:2451 ../mail/em-format-html-display.c:2487
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:2435
+#: ../mail/em-format-html-display.c:2453
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:2497
+#: ../mail/em-format-html-display.c:2506
 msgid "O_pen With"
 msgstr "O_tvori pomoću"
 
-#: ../mail/em-format-html-display.c:2566
+#: ../mail/em-format-html-display.c:2577
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -12269,149 +12066,189 @@ msgstr ""
 "Evolucija ne može da iscrta ovo pismo pošto je preveliko. Možete ga "
 "pogledati neformatirano ili pomoću spoljašnjeg uređivača teksta."
 
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. strana od %d"
 
-#: ../mail/em-format-html.c:484 ../mail/em-format-html.c:486
+#: ../mail/em-format-html.c:486 ../mail/em-format-html.c:495
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Dovlačenje ’%s‘"
 
-#: ../mail/em-format-html.c:622
+#: ../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:893
+#: ../mail/em-format-html.c:906
 msgid "Malformed external-body part."
 msgstr "Loše složen spoljni deo poruke."
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:936
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP stranicu (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:947
 #, 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:936
+#: ../mail/em-format-html.c:949
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
-#: ../mail/em-format-html.c:957
+#: ../mail/em-format-html.c:970
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežni podatak (%s)"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:981
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
 
-#: ../mail/em-format-html.c:1195
+#: ../mail/em-format-html.c:1208
 msgid "Formatting message"
 msgstr "Oblikovanje poruke"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:849 ../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:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
 msgid "Cc"
 msgstr "Kopija (Cc)"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
 msgid "Bcc"
 msgstr "Nevidljiva kopija (Bcc)"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1665 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1045
+#: ../mail/em-format-html.c:1678 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1182
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1692
+#: ../mail/em-format-html.c:1705
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1695
+#: ../mail/em-format-html.c:1708
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1705 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1718 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:855 ../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:1728 ../mail/em-format.c:855
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1741 ../mail/em-format.c:856
+#: ../mail/em-mailer-prefs.c:94
 msgid "Newsgroups"
 msgstr "Grupe za vesti"
 
-#: ../mail/em-format.c:1119
+#: ../mail/em-format.c:1120
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../mail/em-format.c:1158 ../mail/em-format.c:1306 ../mail/em-format.c:1608
+#: ../mail/em-format.c:1159
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
 
-#: ../mail/em-format.c:1288 ../mail/em-format.c:1444
+#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nije moguća obrada MIME poruke. Prikazivanje izvora."
 
-#: ../mail/em-format.c:1296
+#: ../mail/em-format.c:1300
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržani tip šifre za multipart/encrypted"
 
-#: ../mail/em-format.c:1463
+#: ../mail/em-format.c:1310
+#, fuzzy
+msgid "Could not parse PGP/MIME message"
+msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
+
+#: ../mail/em-format.c:1310
+#, fuzzy
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
+
+#: ../mail/em-format.c:1467
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
 msgid "Error verifying signature"
 msgstr "Greška pri proveri potpisa"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri proveri potpisa"
 
+#: ../mail/em-format.c:1612
+#, fuzzy
+msgid "Could not parse PGP message"
+msgstr "Nije moguće pravljenje poruke."
+
+#: ../mail/em-format.c:1612
+#, fuzzy
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
+
+# bug: requires a comment on usage
 # slično kao za mesece i nedelje
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Every time"
-msgstr "Svaki put"
+msgstr "svaki put"
 
-#: ../mail/em-mailer-prefs.c:104
+# bug: requires a comment on usage
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per day"
-msgstr "Jednom dnevno"
+msgstr "jednom dnevno"
 
-#: ../mail/em-mailer-prefs.c:105
+# bug: requires a comment on usage
+#: ../mail/em-mailer-prefs.c:107
 msgid "Once per week"
-msgstr "Jednom nedeljno"
+msgstr "jednom nedeljno"
 
-#: ../mail/em-mailer-prefs.c:106
+# bug: requires a comment on usage
+#: ../mail/em-mailer-prefs.c:108
 msgid "Once per month"
-msgstr "Jednom mesečno"
+msgstr "jednom mesečno"
+
+#: ../mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:785
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:806
+#, fuzzy
+msgid "No Junk plugin available"
+msgstr "Nema dostupnog opisa."
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12423,48 +12260,48 @@ msgstr ""
 "\n"
 "Molim budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nije moguće pravljenje nove fascikle ’%s‘: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Nije moguće umnožiti fasciklu ’%s‘ u ’%s‘: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nije moguća pretraga za postojećim poštanskim sandučićima u ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nije moguće otvaranje starog POP čuvaj-na-serveru podatka ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Nije moguće pravljenje POP3 čuvaj-na-serveru direktorijuma podataka ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nije moguće umnožavanje POP3 čuvaj-na-serveru podatka ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nije uspelo pravljenje lokalne ostave pošte ’%s‘: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2710
 #, 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:2732
+#: ../mail/em-migrate.c:2729
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12472,16 +12309,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:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:568 ../mail/em-popup.c:579
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:632
 msgid "_Add to Address Book"
 msgstr "Dodaj u _imenik"
 
@@ -12506,28 +12343,28 @@ msgstr "Izaberite server."
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
-#: ../mail/em-utils.c:124
+#: ../mail/em-utils.c:120
 msgid "Do not show this message again."
 msgstr "Ne prikazuj ponovo ovu poruku."
 
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:315
 msgid "Message Filters"
 msgstr "Propusni_ci poruka"
 
-#: ../mail/em-utils.c:404 ../mail/em-utils.c:436
+#: ../mail/em-utils.c:368
 msgid "message"
 msgstr "poruka"
 
-#: ../mail/em-utils.c:571
+#: ../mail/em-utils.c:559
 msgid "Save Message..."
 msgstr "Sačuvaj poruku..."
 
-#: ../mail/em-utils.c:620
+#: ../mail/em-utils.c:608
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1104
+#: ../mail/em-utils.c:1092
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -12536,47 +12373,47 @@ msgstr "Poruke od %s"
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:590
 msgid "Search Folder source"
 msgstr "Izvor fas_cikle pretrage"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
 msgstr "Dozvoli evoluciji da prikaže tekstualni deo ograničene veličine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Automatic smiley recognition"
 msgstr "Automatsko prepoznavanje smešaka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Check incoming mail being junk"
 msgstr "Proveri da li je pristigla pošta đubre"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Composer Window default height"
 msgstr "Podrazumevana visina prozora sastavljača"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Composer Window default width"
 msgstr "Podrazumevana širina prozora sastavljača"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA"
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12584,79 +12421,94 @@ msgstr ""
 "Sažmi prikaz adresa u PRIMA/KOPIJA/NEVIDLJIVA KOPIJA na broj naznačen u "
 "address_count-u."
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Default charset in which to compose messages"
 msgstr "Podrazumevani skup znakova za sastavljanje poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Default charset in which to compose messages."
 msgstr "Podrazumevani skup znakova za sastavljanje poruka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default height of the Composer Window"
 msgstr "Podrazumevana visina prozora sastavljača"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default height of the Message Window"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default height of the Subscribe dialog"
 msgstr "Podrazumevana visina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+msgid "Default value for thread expand state"
+msgstr "Podrazumevan naslov poruke."
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default width of the Composer Window"
 msgstr "Podrazumevana širina prozora sastavljača"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default width of the Message Window"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default width of the Subscribe dialog"
 msgstr "Podrazumevana širina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Directory for saving mail component files"
 msgstr "Direktorijum za čuvanje datoteka modula za poštu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 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.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
+#, fuzzy
+msgid "Empty Junk folders on exit"
+msgstr "Prazni fascikle sa smećem na 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.in.h:26
+#: ../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."
+
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smećem pri zatvaranju Evolucije."
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogućava prikaz kurzora, tako da vidite kurzor dok čitate poruku."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Enable or disable type ahead search feature"
 msgstr "Uključi ili isključi mogućnost traženja kucanja u napred"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12669,23 +12521,23 @@ msgstr ""
 "automatski na tu fasciklu."
 
 # bug: unclear
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Enable to render message text part of limited size."
 msgstr "Uključite da iscrtavate tekstualni deo poruke ograničene veličine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kurzora"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Height of the message-list pane."
 msgstr "Visina površi liste poruka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12693,7 +12545,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.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12701,7 +12553,7 @@ msgstr ""
 "Ako je „Pregled porkue“ površ uključena, onda pokažite je jednu do druge "
 "radije nego uspravno."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:39
 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 "
@@ -12711,27 +12563,38 @@ 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.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid ""
+"It disables the feature where repeated prompts to ask if offline sync is "
+"required."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
 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.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:42
+#, fuzzy
+msgid "Last time empty junk was run"
+msgstr "Poslednje vreme pražnjenja smeća"
+
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Last time empty trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "List of Labels and their associated colors"
 msgstr "Lista oznaka i njima dodeljenih boja"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "List of accepted licenses"
 msgstr "Lista prihvaćenih licenci"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "List of accounts"
 msgstr "Lista naloga"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12739,11 +12602,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.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
 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.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
 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."
@@ -12751,118 +12614,132 @@ 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.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
 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.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista imena protokola čija je licenca prihvaćena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Load images for HTML messages over http"
 msgstr "Učitava slike za HTML poruke preko http-a"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
 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 "
 "load images off the net"
 msgstr ""
 "Učitava slike za HTML poruke preko http(s)-a. Moguće su vrednosti: 0 - "
-"Nikada ne učitavaj slike sa mreže 1. - Učitavaj slike ukoliko je pošiljalac "
-"u imeniku 2 - Uvek učitavaj slike sa mreže"
+"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.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Log filter actions"
 msgstr "Beleži radnje filtera"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../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.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava kao viđenu posle navedenog roka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../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.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../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.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Message Window default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Message Window default width"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil prikaza poruke ( „normalan“, „sva zaglavlja“, „izvor“)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
+#, fuzzy
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Najmanje dana između pražnjenja smeća na izlazu"
+
+#: ../mail/evolution-mail.schemas.in.h:66
 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.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:67
+#, fuzzy
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
+
+#: ../mail/evolution-mail.schemas.in.h:68
 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.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obaveštenje o novoj pošti"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "New Mail Notify type"
 msgstr "Tip obaveštenja o novoj pošti"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:71
 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.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Prompt on empty subject"
 msgstr "Pita kada je naslov prazan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
 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.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:74
 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.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Prompt when user expunges"
 msgstr "Pita pri pražnjenju"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Prompt when user only fills Bcc"
 msgstr "Pita kada korisnik unese samo nevidljivu kopiju (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:78
 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.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12870,110 +12747,132 @@ 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.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:80
 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.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:81
 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.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Prompt while marking multiple messages"
 msgstr "Pita pri označavanju više poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:84
 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.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Run junk test on incoming mail"
 msgstr "Proveri da li ima đubreta u dolaznoj pošti"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Save directory"
 msgstr "Sačuvaj direktorijum"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji poštu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano šalje poštu kao HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:92
 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.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Show photo of the sender"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
 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.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:98
+#, fuzzy
+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"
+
+#: ../mail/evolution-mail.schemas.in.h:99
 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.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 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.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 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.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Spell check inline"
 msgstr "Provera pravopisa unutar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Subscribe dialog default width"
 msgstr "Podrazumevana širina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Terminal font"
 msgstr "Slovni lik terminala"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Text message part limit"
 msgstr "Ograničenje tekstualnog dela poruke"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+#, fuzzy
+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."
+
+#: ../mail/evolution-mail.schemas.in.h:109
 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.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "The terminal font for mail display"
 msgstr "Slovni lik terminala za prikaz pošte"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:111
 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.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:112
 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."
@@ -12981,7 +12880,14 @@ 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.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:113
+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."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
 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;"
@@ -12989,10 +12895,14 @@ msgid ""
 "mail view."
 msgstr ""
 "Ovaj ključ treba da sadrži listu XML struktura za navođenje prilagođenih "
-"zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;"
-"header enabled&gt; - omogućeno za prikazivanje zaglavlja u pregledu pošte."
+"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
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13000,103 +12910,111 @@ msgstr ""
 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
 "posle čega je „...“ prikazano."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Thread the message list."
 msgstr "Razvrstava spisak poruka po raspravama."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Thread the message-list"
 msgstr "Razvrstaj poruke po raspravama"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži poruke prema naslovu rasprave"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Timeout for marking message as Seen"
 msgstr "Vreme za označavanje poruka kao viđene"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Timeout for marking message as Seen."
 msgstr "Vreme za označavanje poruka kao viđene."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.h:124
+#, fuzzy
+msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:125
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)"
 msgstr "Koristi servis i klijenta Ubice spama (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Use custom fonts"
 msgstr "Koristi sopstveni slovni lik"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi sopstveni slovni lik za prikaz pošte"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Use side-by-side or wide layout"
 msgstr "Koristite jedan do drugog ili široki raspored"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Variable width font"
 msgstr "Slovni lik promenljive veličine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "View/Bcc menu item is checked"
 msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "View/Bcc menu item is checked."
 msgstr "Opcija Pregled/nevidljiva kopija (Bcc) je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "View/Cc menu item is checked"
 msgstr "Opcija Pregled/kopija (Cc) je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "View/Cc menu item is checked."
 msgstr "Opcija Pregled/kopija (Cc) je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "View/From menu item is checked"
 msgstr "Opcija Pregled/šalje je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "View/From menu item is checked."
 msgstr "Opcija Pregled/šalje je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "View/PostTo menu item is checked"
 msgstr "Opcija Pregled/prima je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "View/PostTo menu item is checked."
 msgstr "Opcija Pregled/pošalji je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "View/ReplyTo menu item is checked"
 msgstr "Opcija Pregled/odgovor je izabrana"
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "View/ReplyTo menu item is checked."
 msgstr "Opcija Pregled/odgovor je izabrana."
 
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13104,11 +13022,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.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Width of the message-list pane"
 msgstr "Širina površi liste poruka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Width of the message-list pane."
 msgstr "Širina površi liste poruka."
 
@@ -13125,12 +13043,10 @@ msgid "Import mail from Elm."
 msgstr "Važna pošta iz programa Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
@@ -13142,110 +13058,20 @@ msgstr "Berkli poštansko sanduče (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poštanskog sandučeta"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "Uvoženje ’%s‘"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "Sačekajte"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "Uvoženje poštanskog sandučeta"
 
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#, c-format
+msgid "Importing `%s'"
+msgstr "Uvoženje ’%s‘"
+
 #: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretraga %s"
 
-#: ../mail/importers/netscape-importer.c:74
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Filter važnosti „%s“"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Neki od Netscape filtera za poštu zasnovani su\n"
-"na prioritetima koje Evolucija ne koristi.\n"
-"Umesto toga Evolucija daje rezultate u rasponu od\n"
-"-3 do 3 koji se dodeljuju porukama i u skladu sa time\n"
-"filtriraju.\n"
-"\n"
-"Kao privremeno rešenje, dodata je grupa filtera imena \n"
-"„Prioritetni filter“ koja pretvara Netscape filtere za poštu u\n"
-"rezultate Evolucije, a promenjeni filteri koriste rezultate umesto\n"
-"prioriteta. Proverite uvežene filtere da se uverite\n"
-"da li sve radi kao što bi trebalo."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Neki od Netscape filtera za poštu koriste\n"
-"mogućnost „Zanemari raspravu“ ili „Prati raspravu“\n"
-"koju Evolucija ne podržava.\n"
-"Ovi filteri će biti izostavljeni."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Neki od Netscape filtera za poštu proveravaju\n"
-"da li u telu poruka postoji (ne)jednakost za dati niz,\n"
-"što Evolucija ne podržava. Ovi filteri\n"
-"su promenjeni da proveravaju da li taj niz jeste\n"
-"ili nije sadržan u telu poruke."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolucija uvozi stare Netscape podatke"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Uvoženje Netscape podataka"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Podešavanja"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "Filteri pošte"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolucija je pronašla Netscape datoteke pošte.\n"
-"Želite li da budu uvežene u Evoluciju?"
-
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Uvoženje Pine podataka"
@@ -13282,7 +13108,7 @@ msgstr "%s dopisna lista"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:531
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13290,7 +13116,7 @@ msgstr[0] "%d obrisano"
 msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:533
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13298,7 +13124,7 @@ msgstr[0] "%d đubre"
 msgstr[1] "%d đubreta"
 msgstr[2] "%d đubreta"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:536
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13306,7 +13132,7 @@ msgstr[0] "%d u pripremi"
 msgstr[1] "%d u pripremi"
 msgstr[2] "%d u pripremi"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:538
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13314,7 +13140,7 @@ msgstr[0] "%d poslato"
 msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:540
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13322,7 +13148,15 @@ msgstr[0] "%d neposlato"
 msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:546
+#, fuzzy, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ", %d nepročitano"
+msgstr[1] ", %d nepročitane"
+msgstr[2] ", %d nepročitanih"
+
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13330,48 +13164,48 @@ msgstr[0] "%d ukupno"
 msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 
-#: ../mail/mail-component.c:558
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d nepročitano"
-msgstr[1] ", %d nepročitane"
-msgstr[2] ", %d nepročitanih"
+#: ../mail/mail-component.c:551
+#, fuzzy, c-format
+msgid " %d selected, "
+msgid_plural " %d selected, "
+msgstr[0] ", %d izabrano"
+msgstr[1] "%d izabrana"
+msgstr[2] "%d izabranih"
 
-#: ../mail/mail-component.c:840
+#: ../mail/mail-component.c:876
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:877
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:878
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: ../mail/mail-component.c:848
+#: ../mail/mail-component.c:884
 msgid "New Mail Folder"
 msgstr "Nova fascikla za poštu"
 
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:885
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:886
 msgid "Create a new mail folder"
 msgstr "Napravi novu fasciklu za poštu"
 
-#: ../mail/mail-component.c:996
+#: ../mail/mail-component.c:1033
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Neuspela nadogradnja podešavanja pošte ili fascikli."
 
-#: ../mail/mail-config.c:85
+#: ../mail/mail-config.c:81
 msgid "I_mportant"
 msgstr "Važ_no"
 
 #. red
-#: ../mail/mail-config.c:86
+#: ../mail/mail-config.c:82
 msgid "_Work"
 msgstr "Po_sao"
 
@@ -13379,17 +13213,17 @@ msgstr "Po_sao"
 # Create the default Person task list
 # orange
 #. orange
-#: ../mail/mail-config.c:87
+#: ../mail/mail-config.c:83
 msgid "_Personal"
 msgstr "L_ično"
 
 #. forest green
-#: ../mail/mail-config.c:88
+#: ../mail/mail-config.c:84
 msgid "_To Do"
 msgstr "Za uradi_ti"
 
 #. blue
-#: ../mail/mail-config.c:89
+#: ../mail/mail-config.c:85
 msgid "_Later"
 msgstr "Kasni_je"
 
@@ -13402,53 +13236,54 @@ 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
-msgid "<b>Sig_natures</b>"
-msgstr "<b>Po_tpisi</b>"
+#, fuzzy
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>Opcije kalendara</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>_Languages</b>"
-msgstr "<b>_Jezici</b>"
+msgid "<b>Sig_natures</b>"
+msgstr "<b>Po_tpisi</b>"
 
 #: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Ovo će učiniti filter pouzdanijim, ali sporijim</small>"
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:7
+msgid "<b>_Languages</b>"
+msgstr "<b>_Jezici</b>"
+
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Podaci o nalogu</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tip autentifikacije</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentifikacija</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sastavljanje poruka</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Podešavanje</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Podrazumevano ponašanje</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Briše poštu</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Prikazana _zaglavlja poruka</span>"
 
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">Mogućnosti filtera</span>"
-
 #: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Oznake i boje</span>"
@@ -13630,134 +13465,133 @@ msgstr "Pod_razumevano"
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk mails on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Digitalno potpiši odlazeće poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 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:71
+#: ../mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 msgid "Drafts _Folder:"
 msgstr "_Fascikla Priprema:"
 
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "O_mogući"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "Nalozi e-pošte"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "Elektronska _adresa:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni fascikle sa _smećem na izlazu"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za ši_frovanje:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:80
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Šifruj odlazeće poruke (podrazumevano)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed width Font:"
 msgstr "Slovni lik srazmerne širine:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Utvrđene-pirine:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Osobine slovnog lika"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Oblikuj poruke u H_TML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Full Nam_e:"
 msgstr "Ime i prezime:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "HTML Mail"
 msgstr "HTML pošta"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.glade.h:90
-msgid "I_nclude remote tests"
-msgstr "U_ključi mrežne provere"
-
 #: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:94
+msgid "Inline original message (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:96
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mailbox location"
 msgstr "Mesto poštanskog sandučeta"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 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:104
+#: ../mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG IB _ključa:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13765,7 +13599,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:111
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13773,132 +13607,135 @@ 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:112
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"Unesite dole ime i elektronsku adresu. „Neobavezna“ polja dole ne moraju "
-"biti popunjena, osim ako ne želite da ove podatke uključite u poruke koje "
-"šaljete."
+"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:113
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "Molim izaberite među sledećim mogućnostima"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 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:115
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "Izab_eri..."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "_Pošalji priznanice:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "_Standardni slovni lik:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Se_lect..."
 msgstr "Iza_beri..."
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML slovni lik fiksirane veličine"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML fixed width font for printing"
 msgstr "Izaberite HTML slovni lik fiksirane veličine za štampu"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML slovni lik promenljive veličine"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML variable width font for printing"
 msgstr "Izaberite HTML slovni lik promenljive veličine za štampu"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži autentifikaciju"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Server _Type: "
 msgstr "_Tip servera: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Signatures Table"
 msgstr "Tabela potpisa"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "T_ype: "
 msgstr "T_ip: "
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 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:144
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13908,7 +13745,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu. "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13916,15 +13753,15 @@ msgstr ""
 "Ukucajte ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: „Poslovni“ ili „Lični“"
 
-#: ../mail/mail-config.glade.h:150 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:152 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:153
 msgid "V_ariable-width:"
 msgstr "Pro_menljiva veličina:"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13934,88 +13771,100 @@ msgstr ""
 "\n"
 "Kliknite „Napred“ za početak. "
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:161
 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:159
+#: ../mail/mail-config.glade.h:162
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Outlook kompatibilnost)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Load images in mail from contacts"
 msgstr "_Učitaj slike od kontakata u poruku"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:167
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj podrazumevani nalog"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:168
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:170
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:172
 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:169
+#: ../mail/mail-config.glade.h:173
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:174
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:175
 msgid "_Script:"
 msgstr "_Skripta:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:178
 msgid "_Show image animations"
 msgstr "Prikaži _animacije"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:179
+msgid "_Show the photograph of sender in the email preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:180
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Sažmite PRIMA/KOPIJA/NEVIDLJIVA KOPIJA zaglavlja u "
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:182
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste slovne likove kao drugi programi"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:183
 msgid "addresses"
 msgstr "Adrese"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:184
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:185
 msgid "description"
 msgstr "opis"
 
@@ -14052,7 +13901,7 @@ msgid "Case _sensitive"
 msgstr "_Osetljivo na veličinu slova"
 
 # timezone.
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "Za_vršeno"
 
@@ -14065,7 +13914,6 @@ msgid "Find in Message"
 msgstr "Pronađi u poruci"
 
 #: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
@@ -14093,7 +13941,7 @@ msgstr "Sigurnosni podaci"
 msgid "Specific folders"
 msgstr "Nvedene fascikle"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14105,11 +13953,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "_Rok:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "_Oznaka:"
 
@@ -14117,7 +13965,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:858
+#: ../mail/mail-folder-cache.c:875
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
@@ -14161,7 +14009,7 @@ msgstr "Slanje poruke %d od %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Neuspelo slanje %d od %d poruka"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:696
 msgid "Canceled."
 msgstr "Otkazano."
 
@@ -14292,54 +14140,59 @@ msgstr "Prekidanje veze sa %s"
 msgid "Reconnecting to %s"
 msgstr "Ponovno povezivanje na %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2361
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Exchange nalog nije na mreži."
+
+#: ../mail/mail-ops.c:2444
 msgid "Checking Service"
 msgstr "Provera usluge"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:161
 msgid "Canceling..."
 msgstr "Odustajanje je u toku..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:387
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Obustavi _sve"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Osvežavanje..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:575
 msgid "Waiting..."
 msgstr "Čekanje..."
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:783
 msgid "Checking for new mail"
 msgstr "Provera za nove poruke"
 
-#: ../mail/mail-session.c:198
+#: ../mail/mail-session.c:202
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:204
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:203
+#: ../mail/mail-session.c:207
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:209
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:243
+#: ../mail/mail-session.c:251
 msgid "User canceled operation."
 msgstr "Korisnik je obustavio operaciju."
 
@@ -14444,8 +14297,8 @@ msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"Dodavanjem smislenog naslova vašim porukama daćete primaocima do znanja o "
-"čemu pišete."
+"Dodavanjem smislenog naslova vašim porukama daćete primaocima do znanja o čemu "
+"pišete."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -14621,55 +14474,66 @@ msgid "Discard changes?"
 msgstr "Zanemariti promenjeno?"
 
 #: ../mail/mail.error.xml.h:46
-msgid "Do not delete"
+#, fuzzy
+msgid "Do not d_elete"
 msgstr "Ne briši"
 
 #: ../mail/mail.error.xml.h:47
+msgid "Do not delete"
+msgstr "Ne briši"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do not disable"
 msgstr "Nemoj isključiti"
 
-#: ../mail/mail.error.xml.h:48
+#: ../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?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Da li želite da sve poruke označite kao pročitane?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Želite li da sačuvate promene?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Unesite lozinku."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Greška pri učitavanju definicija filtera."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Greška tokom operacije."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Greška prilikom {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji, nije moguće prepisivanje."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ukoliko nastavite, nećete moći da vratite ove poruke."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14677,11 +14541,11 @@ msgstr ""
 "Ukoliko obrišete fasciklu, sav njen sadržaj i sadržaj podfascikli će biti "
 "trajno obrisani."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ako nastavite, svi posrednički nalozi biće trajno uklonjeni."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14689,11 +14553,11 @@ msgstr ""
 "Ukoliko nastavite, podaci naloga i svi pripadajući\n"
 "podaci će biti trajno obrisani."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci naloga biće trajno obrisani."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14701,62 +14565,62 @@ msgstr ""
 "Ukoliko izađete, ove poruke neće biti poslate dok ponovo ne pokrenete "
 "Evoluciju."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "Neispravna autentifikacija"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "Filteri pošte su automatski osveženi."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju "
-"samo BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce "
-"poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
+"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
+"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mark all messages as read"
 msgstr "Označi sve poruke kao pročitane"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mark all messages in subfolders as read?"
 msgstr "Označi sve poruke kao pročitane u podfascikli"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid "Mark as _Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Nedostaje fascikla."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Izvori nisu izabrani."
 
-#: ../mail/mail.error.xml.h:75
+#: ../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."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Proverite podešavanja naloga i pokušajte ponovo."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Molim odobrite nalog ili pošaljite korišćenjem nekog drugog."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14764,7 +14628,7 @@ msgstr ""
 "Unesite važeću elektronsku adresu u polje Prima:. Možete pretražiti "
 "elektronske adrese klikom na dugme Prima: pored polja za unos."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14775,50 +14639,60 @@ msgstr ""
 "{0}\n"
 "Ipak poslati?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please provide an unique name to identify this signature."
 msgstr "Molim dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Please wait."
 msgstr "Sačekajte."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem pri prenosu stare fascikle pošte &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server"
 msgstr "Slanje upita serveru"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Slanje upita serveru za listu podržanih mehanizama autentifikacije."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Read receipt requested."
 msgstr "Zatražene priznanice."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Zaista obrisati fasciklu &quot;{0}&quot; i sve podfascikle?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Search Folders automatically updated."
 msgstr "Fascikle pretrage su automatski osvežene."
 
 # bug(slobo): verovatno izveštaj o dostavi
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Send Receipt"
 msgstr "Pošalji priznanicu"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
 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"
+
+#: ../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."
+
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14826,7 +14700,7 @@ msgstr ""
 "Sistemske fascikle neophodne da bi Evolucija ispravno radila se ne mogu "
 "preimenovati, premestiti ili obrisati."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14837,11 +14711,11 @@ msgid ""
 msgstr ""
 "Lista kontakata kojoj šaljete je podešena da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju "
-"samo BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce "
-"poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+"Mnogi sistemi e-pošte dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
+"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
+"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14855,7 +14729,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "I sada je(su) osvežena(e)."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14869,11 +14743,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "I sada je(su) osveženo(a)."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
 msgid "The script file must exist and be executable."
 msgstr "Datoteka skripte mora postojati i biti izvršna."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14881,19 +14755,18 @@ msgstr ""
 "Ova fascikla je možda posredno dodata,\n"
 "idite u uređivač fascikle pretrage i dodajte je izričito, ako želite."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr ""
-"Ova poruka se ne može poslati pošto je isključen nalog sa kojeg šaljete"
+msgstr "Ova poruka se ne može poslati pošto je isključen nalog sa kojeg šaljete"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Ova poruka se ne može poslati pošto niste naveli nijednog primaoca"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14901,22 +14774,22 @@ msgstr ""
 "Ovaj server ne podržava traženi tip autentifikacije i možda uopšte ne "
 "podržava autentifikaciju."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:116
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "Ovo označava sve poruke kao pročitane u izabranoj fascikli i podfasciklama."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to connect to the GroupWise server."
 msgstr "Neuspelo povezivanje na GroupWise server."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14924,39 +14797,39 @@ msgstr ""
 "Nije moguće otvaranje fascikle za pripremu za ovaj nalog.  Koristiti "
 "sistemsku fasciklu za pripremu?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:120
 msgid "Unable to read license file."
 msgstr "Nije moguće čitanje datoteke licence."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:121
 msgid "Use _Default"
 msgstr "Koristi _podrazumevano"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:122
 msgid "Use default drafts folder?"
 msgstr "Koristiti podrazumevanu fasciklu za pripremu?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:125
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlate poruke, želite li ipak da izađete?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:126
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete otvoriti dva naloga istog imena."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:127
 msgid "You must name this Search Folder."
 msgstr "Morate imenovati ovu fasciklu pretrage."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:128
 msgid "You must specify a folder."
 msgstr "Morate navesti fasciklu."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14966,27 +14839,32 @@ msgstr ""
 "Bilo pojedinačnim izborom fascikli, i/ili izborom svih lokalnih fascikli, "
 "svih mrežnih fascikli ili i jednih i drugih."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Prijava na server &quot;{0}&quot; kao &quot;{0}&quot; nije uspela."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Append"
 msgstr "_Dodaj"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:133
 msgid "_Discard changes"
 msgstr "_Zanemari promene"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:134
 msgid "_Do not Mark as Read"
 msgstr "Os_tavi nepročitano"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
+#, fuzzy
+msgid "_Do not Synchronize"
+msgstr "Ne spaša_vaj"
+
+#: ../mail/mail.error.xml.h:137
 msgid "_Expunge"
 msgstr "Iz_baci"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:138
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
@@ -15026,38 +14904,38 @@ msgstr "Više"
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:1469 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476 ../plugins/itip-formatter/itip-view.c:202
+#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Danas %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %l:%M %p"
 
-#: ../mail/message-list.c:1497 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1507 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2263 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2306 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../mail/message-list.c:3654
+#: ../mail/message-list.c:3752
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
@@ -15170,39 +15048,138 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Dodatak za zvuk unutar poruke"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:96
+#, fuzzy
+msgid "Select name of the Evolution archive"
 msgstr "Izaberite ime arhive Evolucije"
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../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:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:139
+#, fuzzy
+msgid "Select name of the Evolution archive to restore"
 msgstr "Izaberite arhivu Evolucije za povraćaj"
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr ""
+
+#: ../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"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:244
+#, fuzzy
+msgid "_Restore Evolution from the backup archive"
+msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+#, fuzzy
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Izaberite arhivu Evolucije za povraćaj"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+#, fuzzy
+msgid "Choose a file to restore"
+msgstr "Izaberite datoteku"
+
+#: ../plugins/backup-restore/backup.c:40
 msgid "Backup Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraćaj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:44
 msgid "Check Evolution archive"
 msgstr "Proverava arhivu Evolucije"
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
 msgstr "Ponovo pokreće Evoluciju"
 
+#: ../plugins/backup-restore/backup.c:48
+#, fuzzy
+msgid "With GUI"
+msgstr "Širina"
+
+#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:107
+#, fuzzy
+msgid "Shutting down Evolution"
+msgstr "Gašenje %s (%s)\n"
+
+#: ../plugins/backup-restore/backup.c:72
+#, fuzzy
+msgid "Backing Evolution accounts and settings"
+msgstr "Pravi rezervu i oporavlja podatke i podešavanja Evolucije"
+
+#: ../plugins/backup-restore/backup.c:77
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:87
+#, fuzzy
+msgid "Backup complete"
+msgstr "_Obeleži kao nezavršeno"
+
+# 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"
+
+#: ../plugins/backup-restore/backup.c:111
+#, fuzzy
+msgid "Backup current Evolution data"
+msgstr "Direktorijum za rezervu Evolucije"
+
+#: ../plugins/backup-restore/backup.c:116
+msgid "Extracting files from the archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:122
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "Izmeni podešavanja Evolucije"
+
+#: ../plugins/backup-restore/backup.c:126
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:244
+#, fuzzy, c-format
+msgid "Backing up to %s"
+msgstr "Pošta za %s"
+
+#: ../plugins/backup-restore/backup.c:249
+#, fuzzy, c-format
+msgid "Restoring from %s"
+msgstr "Uklanjanje 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"
+
+#: ../plugins/backup-restore/backup.c:264
+#, fuzzy
+msgid "Evolution Restore"
+msgstr "Proba Evolucije"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Dodatak za izradu rezerve i oporavak podataka i podešavanja Evolucije."
@@ -15212,49 +15189,88 @@ msgstr "Dodatak za izradu rezerve i oporavak podataka i podešavanja Evolucije."
 msgid "Backup and restore plugin"
 msgstr "Dodatak za izradu rezerve i oporavak"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "Podešavanja za rezervu..."
+#: ../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?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../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?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Invalid Evolution archive"
+msgstr "Proverava arhivu 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"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "Pravi rezervu i oporavlja podatke i podešavanja Evolucije"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
+msgid "R_estore Settings..."
 msgstr "Oporavlja podešavanja..."
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "_Backup Settings..."
+msgstr "Podešavanja za rezervu..."
+
+#: ../plugins/bbdb/bbdb.c:459 ../plugins/bbdb/bbdb.c:468
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
+#: ../plugins/bbdb/bbdb.c:483
 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:477
+#: ../plugins/bbdb/bbdb.c:489
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi imenik za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:504
 msgid "Instant Messaging Contacts"
 msgstr "Brze poruke"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:519
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "Povremeno uskladi podatke o kontaktima i slike sa mog brzog glasnika"
 
-#: ../plugins/bbdb/bbdb.c:513
+#: ../plugins/bbdb/bbdb.c:525
 msgid "Select Address book for Gaim buddy list"
 msgstr "Izaberi imenik za brog glasnia"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:536
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -15272,10 +15288,29 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+msgid "Convert mail text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail text to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
 #: ../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
+msgid "_URL:"
+msgstr "_Adresa :"
+
 #: ../plugins/caldav/caldav-source.c:269
 msgid "Use _SSL"
 msgstr "Koristi šifrovanu vezu"
@@ -15296,6 +15331,11 @@ 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-weather/calendar-weather.c:546
+msgid "_Refresh:"
+msgstr "O_sveži:"
+
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
 msgstr "_Koristi sigurnu vezu"
@@ -15341,15 +15381,15 @@ msgstr "Vreme: grmljavine"
 msgid "Select a location"
 msgstr "Izaberite mesto"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "_Jedinice:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrične (Celzijus, cm, itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperijalne (Farenhajt, inči, itd.)"
 
@@ -15373,11 +15413,11 @@ msgstr ""
 msgid "Copy tool"
 msgstr "Alat za umnožavanje"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Proveri da li je Evolucija podrazumevani program za poštu"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -15494,7 +15534,8 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "Upravljajte podešavanjima delegata za nalog Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+#, fuzzy
+msgid "Delegation Assistant"
 msgstr "Pomoćnik za delegiranje"
 
 #. Miscelleneous settings
@@ -15516,35 +15557,35 @@ msgstr "Veličina fascikli"
 msgid "Exchange Settings"
 msgstr "Exchange podešavanja"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:617
 msgid "_OWA URL:"
 msgstr "_OWA adresa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:643
 msgid "A_uthenticate"
 msgstr "A_utentifikuj"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:836
 msgid "Authentication Type"
 msgstr "Tip autentifikacije"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:850
 msgid "Ch_eck for Supported Types"
 msgstr "_Proveri podržane tipove"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:215
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
+#: ../plugins/exchange-operations/exchange-contacts.c:214
 msgid "0 KB"
 msgstr "0 KB"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15590,69 +15631,106 @@ 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:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:156
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "Custom"
 msgstr "Prilagođeno"
 
+#: ../plugins/exchange-operations/exchange-delegates-user.c:183
+#: ../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.glade.h:1
+msgid "Author (read, create)"
+msgstr "Autor (čita, pravi)"
+
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../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.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:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:252
 #: ../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
+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"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:392
+#, c-format
+msgid "You have been designated \t\t\t\t\t\tas a delegate for %s"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "Delegiraj"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Ukloniti delegata %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 msgid "Could not access Active Directory"
 msgstr "Nije moguće pristupiti aktivnom direktorijumu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr "Nije moguće pronaći sebe u aktivnom direktorijumu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Nije moguće pronaći delegata %s u aktivnom direktorijumu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Nije moguće ukloniti delegata %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 msgid "Could not update list of delegates."
 msgstr "Nije moguće osvežiti listu delegata."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Nije moguće dodati delegata %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 msgid "Error reading delegates list."
 msgstr "Greška pri čitanju liste delegata."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Autor (čita, pravi)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
@@ -15667,20 +15745,12 @@ msgstr "Ko_ntakti: "
 msgid "Delegates"
 msgstr "Delegati"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "Uređivač (čita, pravi, uređuje)"
-
 # E_BOOK_ERROR_URI_ALREADY_LOADED
 # E_BOOK_ERROR_PERMISSION_DENIED
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "Ovlašćenja za"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "Recenzent (samo čita)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15698,8 +15768,13 @@ msgstr "_Delegati mogu da vide lične predmete"
 msgid "_Inbox:"
 msgstr "_Sanduče:"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+#, fuzzy
+msgid "_Summarize permissions"
+msgstr "Delegiraj ovlašćenja"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "Za_duženja:"
 
@@ -15728,23 +15803,71 @@ msgid "Exchange Folder Tree"
 msgstr "Stablo Exchange fascikli"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "Odjavi fasciklu..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Zaista se odjaviti sa fascikle „%s“"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Odjavi se sa fascikle „%s“"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Trenutno, Vaš status je „Nisam u kancelariji“. </b>\n"
+"\n"
+"Želite li da promenite status u „U kancelariji“? "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Poruka kada niste u kancelariji:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Status:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>Dole izabrana poruka će biti automatski poslata svakoj osobi koja Vam "
+"pošalje\n"
+"poštu dok niste u kancelariji.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Trenutno sam u kancelariji"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Trenutno nisam u kancelariji"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Ne, ne menjaj stanje"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Pomoćnik nije u kacelariji"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Da, promeni status"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "Upozorenje o isteku lozinke..."
@@ -15827,10 +15950,6 @@ msgstr "Predmeti za čitanje"
 msgid "Role: "
 msgstr "Uloga: "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Ne, ne menjaj stanje"
-
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
 msgstr "<b>Podešavanja poruke</b>"
@@ -15878,14 +15997,28 @@ 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"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "_Osetljivost: "
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+#, fuzzy
+msgid "_User"
+msgstr "_Korisnik:"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "Izaberite korisnika"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 msgid "Address Book..."
 msgstr "Imenik..."
 
@@ -16040,7 +16173,7 @@ msgid "Folder offline"
 msgstr "Fascikla nije na mreži"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1280
 msgid "Generic error"
 msgstr "Opšta greška"
 
@@ -16090,35 +16223,39 @@ msgid "Password successfully changed."
 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 ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Molim budite sigurni da je ime Globalnog servera za katalog tačno."
 
 # shell:noshell-reason title
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Ponovo pokrenite Evoluciju da bi promene nastupile"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please select a user."
 msgstr "Izaberite korisnika."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr "Server je odbio lozinku jer je preslaba."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange nalog će biti isključen kada izađete iz Evolucije"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange nalog će biti ukloljen kada izađete iz Evolucije"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange server nije kompatibilan sa Exchange Connector-om."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16126,7 +16263,7 @@ msgstr ""
 "Server ima pokrenut Exchange 5.5. Exchange Connector \n"
 "podržava samo Microsoft Exchange 2000 i 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16140,52 +16277,58 @@ msgstr ""
 "\n"
 "Ili ste možda samo pogrešno ukucali lozinku."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr "Pokušajte ponovo drugom lozinkom."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to add user to access control list:"
 msgstr "Nije moguća dodati korisnika na listu za kontrolu pristupa:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to edit delegates."
 msgstr "Nije moguće uređivanje delegata."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unknown error looking up {0}"
 msgstr "Nepoznata greška u pronalaženju {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error."
 msgstr "Nepoznata greška."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown type"
 msgstr "Nepoznat tip"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unsupported operation"
 msgstr "Operacija nije podržana"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Približavate se vašoj kvoti koju imate za smeštanje pošte na ovom serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
 msgstr "Ne možete da sebe delegirate"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Prekoračili ste kvotu za smeštaj pošte na ovom serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr "Možete samo da podesite jedan Exchange nalog."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16193,15 +16336,15 @@ msgstr ""
 "Trenutna iskorišćenost je: {0} KB. Probajte da oslobodite prostor brisanjem "
 "nekih poruka."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
-"Trenutna iskorišćenost je: {0} KB. Od ovog trenutka nećete moći ni da "
-"šaljete ni da primate poštu."
+"Trenutna iskorišćenost je: {0} KB. Od ovog trenutka nećete moći ni da šaljete "
+"ni da primate poštu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16209,19 +16352,19 @@ msgstr ""
 "Trenutna iskorišćenost je: {0} KB. Nećete moći da šaljete poštu dok ne "
 "oslobodite prostor brisanjem nekih poruka."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr "Lozinka je istekla."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} ne može biti dodat na listu za kontrolu pristupa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} is already a delegate"
 msgstr "{0} je već delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already in the list"
 msgstr "{0} je već ne listi"
 
@@ -16241,8 +16384,7 @@ msgstr "Odjava sa fascikle „%s“"
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
 msgstr ""
-"Dozvoljava odjavu fascikli za poštu u meniju desnim klikom na stablo "
-"fascikli."
+"Dozvoljava odjavu fascikli za poštu u meniju desnim klikom na stablo fascikli."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -16252,7 +16394,7 @@ msgstr "Odjavi fascikle"
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:434
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:428
 msgid "Checklist"
 msgstr "Spisak"
 
@@ -16508,36 +16650,64 @@ msgstr "Dodaj "
 msgid "Modify"
 msgstr "Izmeni"
 
-#: ../plugins/groupwise-features/status-track.c:118
+#: ../plugins/groupwise-features/status-track.c:103
 msgid "Message Status"
 msgstr "Status poruke"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:132
+#: ../plugins/groupwise-features/status-track.c:117
 msgid "<b>Subject</b> :"
 msgstr "<b>Naslov</b>"
 
-#: ../plugins/groupwise-features/status-track.c:144
+#: ../plugins/groupwise-features/status-track.c:129
 msgid "<b>From</b> :"
 msgstr "<b>Šalje</b>"
 
-#: ../plugins/groupwise-features/status-track.c:157
+#: ../plugins/groupwise-features/status-track.c:142
 msgid "<b>Creation date</b> :"
 msgstr "<b>Datum pravljenja</b>"
 
-#: ../plugins/groupwise-features/status-track.c:177
-msgid "<b>Recipients </b>"
-msgstr "<b>Primaoci</b>"
-
-#: ../plugins/groupwise-features/status-track.c:181
-msgid "<b>Action</b>"
-msgstr "<b>Radnja</b>"
+#: ../plugins/groupwise-features/status-track.c:178
+#, fuzzy
+msgid "Recipient: "
+msgstr "Primaoci"
 
 #: ../plugins/groupwise-features/status-track.c:185
-msgid "<b>Date and Time</b>"
-msgstr "<b>Datum i vreme</b>"
+#, fuzzy
+msgid "Delivered: "
+msgstr "_Isporučeno"
+
+#: ../plugins/groupwise-features/status-track.c:191
+#, fuzzy
+msgid "Opened: "
+msgstr "Otvori"
+
+#: ../plugins/groupwise-features/status-track.c:196
+#, fuzzy
+msgid "Accepted: "
+msgstr "Prihvaćeno"
+
+#: ../plugins/groupwise-features/status-track.c:201
+#, fuzzy
+msgid "Deleted: "
+msgstr "Obrisano"
+
+#: ../plugins/groupwise-features/status-track.c:206
+#, fuzzy
+msgid "Declined: "
+msgstr "Odbijeno"
+
+#: ../plugins/groupwise-features/status-track.c:211
+#, fuzzy
+msgid "Completed: "
+msgstr "Završeno "
+
+#: ../plugins/groupwise-features/status-track.c:216
+#, fuzzy
+msgid "Un-delivered: "
+msgstr "_Isporučeno"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Prati status poruke..."
 
@@ -16549,15 +16719,15 @@ msgstr "Dodatak za nameštanje Hulinih izvora kalendara."
 msgid "Hula Account Setup"
 msgstr "Podešavanje Hula naloga"
 
-#: ../plugins/imap-features/imap-headers.c:133
+#: ../plugins/imap-features/imap-headers.c:134
 msgid "Custom Header"
 msgstr "Prilagođeno zaglavlje"
 
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:256
 msgid "Custom Headers"
 msgstr "Prilagođena zaglavlja"
 
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:266
 msgid "IMAP Headers"
 msgstr "IMAP zaglavlja"
 
@@ -16566,7 +16736,8 @@ msgid "<b>Custom Headers</b>"
 msgstr "<b>Prilagođena zaglavlja</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
+#, fuzzy
+msgid "<b>IMAP Headers</b>"
 msgstr "<b>IMAP zaglavlja</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
@@ -16593,8 +16764,7 @@ msgid ""
 "The more headers you have the more time it will take to download."
 msgstr ""
 "Izaberite postavke IMAP zaglavlja. \n"
-"Što više zaglavlja imate više će vremena biti potrebno za njihovo "
-"preuzimanje."
+"Što više zaglavlja imate više će vremena biti potrebno za njihovo preuzimanje."
 
 #: ../plugins/imap-features/imap-headers.glade.h:9
 msgid ""
@@ -16620,20 +16790,20 @@ msgstr "Izvez_i u kalendar"
 msgid "_Import to Tasks"
 msgstr "Uvezi u _zaduženja"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:203
+#: ../plugins/import-ics-attachments/icsimporter.c:206
 msgid "Import ICS"
 msgstr "Uvezi Internet kalendar"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:231
+#: ../plugins/import-ics-attachments/icsimporter.c:233
 msgid "Select Task List"
 msgstr "Izaberit_e spisak zaduženja"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:235
+#: ../plugins/import-ics-attachments/icsimporter.c:237
 msgid "Select Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:266
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "U_voz"
 
@@ -16646,11 +16816,12 @@ msgstr "Uvezi u kalendar"
 msgid "Imports ICS attachments to calendar."
 msgstr "Uvozi ICS priloge u kalendar."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:64
+#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for a iPod failed</span>\n"
+"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
 "\n"
-"Evolution could not find a iPod to synchronize with.Either it is not "
+"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"
@@ -16676,154 +16847,117 @@ msgstr "Uskladi sa iPod džepnim uređajem"
 msgid "iPod Synchronization"
 msgstr "_Usklađivanje sa iPod džepnim uređajem"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Nema izlazne/krajnje fascikle!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"Izlazna fascikla nije pronađena na iPod uređaju! Molim proverite da li je "
-"džepni uređaj pravilno podešen i pokušajte ponovo."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Nije moguć izvoz podataka!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Neuspešan izvoz podataka."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Nije moguće otvoriti imenik!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Ne mogu da otvorim Evolucijin imenik kako bi izvezao podatke."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Ne mogu otvoriti kalendar/spisak obaveza"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Ne mogu otvoriti Evolucijin kalendar/spisak za uraditi da bi izvezao podatke."
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:427
+#: ../plugins/itip-formatter/itip-formatter.c:548
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Nije moguće otvaranje kalendara „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, 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:441
+#: ../plugins/itip-formatter/itip-formatter.c:594
 #, 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:517
+#: ../plugins/itip-formatter/itip-formatter.c:670
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:677
 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:528
+#: ../plugins/itip-formatter/itip-formatter.c:681
 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:532
+#: ../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:605
+#: ../plugins/itip-formatter/itip-formatter.c:758
 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:801
+#: ../plugins/itip-formatter/itip-formatter.c:921
 msgid "Unable to parse item"
 msgstr "Nije moguća obrada predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:979
 #, 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:871
+#: ../plugins/itip-formatter/itip-formatter.c:991
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru ’%s‘ kao prihvaćeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:995
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru ’%s‘ uz rezervu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1000
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru ’%s‘ kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1005
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1099
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1106
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1108
 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:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1193
 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:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1220
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nije moguće osvežavanje za učesnika. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1224
 msgid "Attendee status updated"
 msgstr "Stanje učesnika je osveženo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1351
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1352
 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:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1387
+#: ../plugins/itip-formatter/itip-formatter.c:1405
+#: ../plugins/itip-formatter/itip-formatter.c:1486
 msgid "The item in the calendar is not valid"
 msgstr "Predmet u kalendaru nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/itip-formatter/itip-formatter.c:1406
+#: ../plugins/itip-formatter/itip-formatter.c:1487
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16831,11 +16965,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:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više predmeta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1418
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16845,76 +16979,76 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2244
 msgid "_Delete message after acting"
 msgstr "_Obriši poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2254
+#: ../plugins/itip-formatter/itip-formatter.c:2286
 msgid "Conflict Search"
 msgstr "Tabela pretrage za preklapanjima"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2269
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Danas %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Danas %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Sutra"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Sutra %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Sutra %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Sutra %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:254
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -16924,69 +17058,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:280
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -16996,280 +17130,337 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> preko %s objavi sledeći podatak o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> objavi sledeći podatak o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> Vam delegira sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> preko %s zahteva Vaše prisustvo na sledećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> zahteva Vaše prisustvo na sledećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> preko %s želi da doda postojećem sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 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:371
+#: ../plugins/itip-formatter/itip-view.c:380
+#, fuzzy, 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:"
+
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> želi da primi najnoviji podatak za sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, 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:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> posla sledeći odgovor za sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> preko %s otkaza sledeći sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> otkaza sledeći sastanak."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> predloži sledeće promene sastanka."
+
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> predloži sledeće promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> preko %s odbi sledeće promene sastanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> odbi sledeće promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> preko %s objavi sledeće zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> objavi sledeće zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> zahteva da %s preuzme sledeće zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> preko %s Vam dodeli zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> Vam dodeli zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b preko %s želi da doda postojećem zaduženju:"
 
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 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:439
+#: ../plugins/itip-formatter/itip-view.c:468
+#, fuzzy, 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:"
+
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
-"<b>%s</b> želi da dobije najnovije informacije za sledeće dodeljeno "
-"zaduženje:"
+"<b>%s</b> želi da dobije najnovije informacije za sledeće dodeljeno zaduženje:"
+
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, 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:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> posla nazad sledeći odgovor na dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> preko %s otkaza sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 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:451
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, 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:"
+
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> predloži sledeće promene u dodeli zaduženja:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> preko %s odbi sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> odbi sledeće dodeljeno zaduženje:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> preko %s objavi sledeću belešku:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> objavi sledeću belešku:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> preko %s želi da doda postojećoj belešci:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> želi da doda postojećoj belešci:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> preko %s otkaza sledeću deljenu belešku:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> otkaza sledeće deljenu belešku:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:815
 msgid "_Open Calendar"
 msgstr "_Otvori kalendar"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:822
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:855
 msgid "_Accept"
 msgstr "Pri_hvati"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:825
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:826
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Accept all"
 msgstr "P_rihvati sve"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Send Information"
 msgstr "Pošalji podat_ke"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Update Attendee Status"
 msgstr "Osveži stanje učesni_ka"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update"
 msgstr "Os_veži"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:1006
 msgid "Start time:"
 msgstr "Vreme početka:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:1015
 msgid "End time:"
 msgstr "Vreme završetka:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1081
 msgid "Comment:"
 msgstr "Napomena:"
 
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
+#: ../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:1042
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1104
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "Pri_meni na sve strukture"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1835
 msgid "_Tasks :"
 msgstr "Za_duženja:"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1837
 msgid "Memos :"
 msgstr "Beleške :"
 
@@ -17310,6 +17501,46 @@ msgstr "Dozvoljava isključivanje naloga."
 msgid "Disable Account"
 msgstr "Isključi nalog"
 
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Enable libnotify notifications of new mail"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Every time a new mail arrives, pop up a libnotify notification."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Make the status icon blink"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "When the new-mail status icon is visible, make it blink."
+msgstr ""
+
+#: ../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] ""
+
+#: ../plugins/mail-notification/mail-notification.c:153
+#, fuzzy
+msgid "New email"
+msgstr "Nova beleška"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Obaveštenje o novoj 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."
+msgstr ""
+
 #: ../plugins/mail-remote/client.c:30
 #, c-format
 msgid "System error: %s"
@@ -17459,8 +17690,8 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"Radnju nije moguće izvesti. To znači da zaglavlje za ovu radnju nije "
-"sadržalo obradivu radnju.\n"
+"Radnju nije moguće izvesti. To znači da zaglavlje za ovu radnju nije sadržalo "
+"obradivu radnju.\n"
 "\n"
 "Zaglavlje: {0}"
 
@@ -17580,17 +17811,13 @@ msgstr "Obavesti D-BUS porukom kada stigne nova pošta."
 msgid "New Mail Notification"
 msgstr "Obaveštenje o novoj pošti"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Obaveštenje o novoj pošti"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Dodatak za uključivanje i isključivanje drugih dodataka."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:202
 msgid "Plugin Manager"
 msgstr "Upravljač dodacima"
 
@@ -17602,22 +17829,22 @@ msgstr "Uključuje i isključuje dodatke"
 msgid "_Plugins"
 msgstr "Do_daci"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:53
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/plugin-manager/plugin-manager.c:54
 #: ../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:193
+#: ../plugins/plugin-manager/plugin-manager.c:215
 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:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:268
+#: ../plugins/plugin-manager/plugin-manager.c:327
 msgid "Plugin"
 msgstr "Dodatak"
 
@@ -17662,6 +17889,10 @@ msgstr "HTML model"
 msgid "Gives an option to print mail from composer"
 msgstr "Daje mogućnost štampe poruke iz sastavljača"
 
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "Štampaj poruku"
+
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
@@ -17757,10 +17988,22 @@ msgstr "_Vrsta usluge:"
 msgid "_File:"
 msgstr "Dato_teka:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Lozinka:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "O_bjavi kao:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Zapamti lozinku"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17769,20 +18012,32 @@ msgstr ""
 "iKal\n"
 "Slobodno/zauzeto"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
+#: ../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>"
+
+#: ../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 "
+"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."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
+#, fuzzy
+msgid "SpamAssassin junk plugin"
 msgstr "Ubica neželjene pošte (dodatak)"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
@@ -17791,7 +18046,7 @@ msgstr "Dodatak za čuvanje svih priloga ili delova poruke odjednom."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:334
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "Sačuvaj priloge"
 
@@ -17803,16 +18058,16 @@ msgstr "Sačuvaj priloge..."
 msgid "Save all attachments"
 msgstr "Sačuvaj sve priloge"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
 msgid "Select save base name"
 msgstr "Izaberi ime za snimanje baze"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "MIME tip"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:20
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -17950,15 +18205,15 @@ msgstr "Dodatak koji rukuje uvodnim čarobnjakom"
 msgid "Startup wizard"
 msgstr "Čarobnjak za početak"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Dobro došli"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -17971,26 +18226,31 @@ msgstr ""
 "\n"
 "Kliknite „Napred“ da nastavite. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:134
 msgid "Importing files"
 msgstr "Uvoženje datoteka"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
 msgid "Importing data."
 msgstr "Uvoženje podataka."
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "Sačekajte"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "Obaveštava ako nizanje poruka treba da se vrati na naslov."
@@ -18024,80 +18284,80 @@ msgstr "Proba Evolucije"
 msgid "Evolution Test component"
 msgstr "Probni deo Evolucije"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "A string description of the current printer settings"
 msgstr "Opisni niz trenutnih podešavanja štampača"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "Verzija podešavanja"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Default sidebar width"
 msgstr "Podrazumevana širina bočne trake"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default window height"
 msgstr "Podrazumevana visina prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window state"
 msgstr "Podrazumevano stanje prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window width"
 msgstr "Podrazumevana širina prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Poslednja nadograđena verzija podešavanja"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Lista putanja fascikli za usklađivanje na disku za rad van mreže"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Sidebar is visible"
 msgstr "Bočna oblast je vidljiva"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Preskoči prozorče sa upozorenjem o razvoju"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:472
+#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
 msgid "Start in offline mode"
 msgstr "Počni rad van mreže"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "Statusbar is visible"
 msgstr "Linija sa stanjem je vidljiva"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
-"Verzija podešavanja Evolucije, sa glavnim/sporednim/nivoom podešavanja — "
-"npr. „2.6.0“."
+"Verzija podešavanja Evolucije, sa glavnim/sporednim/nivoom podešavanja — npr. "
+"„2.6.0“."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Podrazumevana visina prozora za poruku, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Podrazumevana širina glavnog prozora, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Podrazumevana širina pomoćne linije, u pikselima."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18105,7 +18365,7 @@ msgstr ""
 "Poslednja nadograđena verzija podešavanja Evolucije, sa glavnim/sporednim/"
 "nivoom podešavanja (npr. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18115,46 +18375,46 @@ msgstr ""
 "Ako je postavljeno „paleta alata“, Gnomovo podešavanje palete alata utvrđuje "
 "stil dugmadi."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Toolbar is visible"
 msgstr "Paleta alata je vidljiva"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Da li će se Evolucija pokrenuti u režimu za rad van mreže."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Da li da prozor bude uvećan do kraja."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Da li da bočna površ bude vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Da li da statusna linija bude vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether the toolbar should be visible."
 msgstr "Da li da paleta alata bude vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Da li će prozorče sa upozorenjem u razvojnim verzijama Evolucije biti "
 "prikazano."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the window buttons should be visible."
 msgstr "Da li da dugmad prozora budu vidljiva."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Window button style"
 msgstr "Stil dugmadi prozora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
@@ -18170,16 +18430,11 @@ msgstr "Uspostavljene veze"
 msgid "Click OK to close these connections and go offline"
 msgstr "Kliknite U redu da prekinete vezu i radite van mreže"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(Neimenovano)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite tip uvoznika:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18193,11 +18448,11 @@ msgstr ""
 "Možete izabrati „Automatsko“ ukoliko ne znate, i Evolucija će pokušati da "
 "sama završi posao."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Izaberite odredište za ovaj uvoz"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18209,27 +18464,27 @@ msgstr ""
 "koja bi se mogla uvesti. Ukoliko želite da pokušate\n"
 "ponovo, kliknite na dugme „Nazad“.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Tip datoteke:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:319
 msgid "Evolution Preferences"
 msgstr "Evolucijine postavke"
 
@@ -18253,27 +18508,27 @@ msgstr "Ime fascikle ne može da sadrži znak „#“."
 msgid "'.' and '..' are reserved folder names."
 msgstr "’.‘ i ’..‘ su zauzeti za imena fascikli."
 
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izgleda da ovaj sistem nema instalirane Gnom pilot alate."
 
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška pri pokretanju %s."
 
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:565
+#: ../shell/e-shell-window-commands.c:584
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor@prevod.org>\n"
@@ -18281,19 +18536,19 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-commands.c:576
+#: ../shell/e-shell-window-commands.c:595
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-commands.c:782
+#: ../shell/e-shell-window-commands.c:803
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-commands.c:795 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:816 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ra_d van mreže"
 
-#: ../shell/e-shell-window-commands.c:808
+#: ../shell/e-shell-window-commands.c:829
 msgid "Work Offline"
 msgstr "Rad van mreže"
 
@@ -18310,33 +18565,33 @@ 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:796
+#: ../shell/e-shell-window.c:820
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../shell/e-shell.c:635
+#: ../shell/e-shell.c:637
 msgid "Uknown system error."
 msgstr "Nepoznata sistemska greška."
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:833 ../shell/e-shell.c:834
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1263 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1272 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "U redu"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1274
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1276
 msgid "Cannot register on OAF"
 msgstr "Nije moguća registracija na OAF"
 
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1278
 msgid "Configuration Database not found"
 msgstr "Baza sa podešavanjima nije nađena"
 
@@ -18346,15 +18601,15 @@ msgstr "Baza sa podešavanjima nije nađena"
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:107
 msgid "New Test"
 msgstr "Nova proba"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:108
 msgid "_Test"
 msgstr "_Proba"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Napravi novi probni predmet"
 
@@ -18397,7 +18652,7 @@ msgstr ""
 "uvoza spoljnih datoteka u Evoluciju."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:219
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18432,7 +18687,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo Vaš doprinos!\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:243
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18440,39 +18695,39 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:250
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:456
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: ../shell/main.c:474
+#: ../shell/main.c:460
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:463
 msgid "Forcibly shut down all Evolution components"
 msgstr "Silom gasi sve delove Evolucije"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:467
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovan prenos podataka iz Evolucije 1.4"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:470
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 
-#: ../shell/main.c:486
+#: ../shell/main.c:472
 msgid "Disable loading of any plugins."
 msgstr "Isključuje učitavanje svih dodataka."
 
-#: ../shell/main.c:516
+#: ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "Evolucija - Lični urednik podataka i program za e-poštu"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:514
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18564,8 +18819,8 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Nadogradnja podataka i podešavanja će zahtevati do {0} prostora na disku, "
-"ali imate na raspolaganju samo {1}.\n"
+"Nadogradnja podataka i podešavanja će zahtevati do {0} prostora na disku, ali "
+"imate na raspolaganju samo {1}.\n"
 "\n"
 "Moraćete da oslobodite više mesta u ličnoj fascikli pre nego što nastavite."
 
@@ -18646,39 +18901,61 @@ msgstr ""
 "Pošto ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u "
 "autentičnost ovog sertifikata osim ako ovde ne naznačite drugačije"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:138
+#: ../smime/gui/certificate-manager.c:156
+#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:407
+#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:639
 msgid "Select a certificate to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:147
+#, fuzzy
+msgid "All PKCS12 files"
+msgstr "PKCS12 lozinka 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"
+
+#: ../smime/gui/certificate-manager.c:279
+#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:726
 msgid "Certificate Name"
 msgstr "Ime sertifikata"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:288
+#: ../smime/gui/certificate-manager.c:514
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:305
 msgid "Expires"
 msgstr "Ističe"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:398
+#, fuzzy
+msgid "All email certificate files"
+msgstr "Izdavač sertifikata e-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"
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -18774,8 +19051,8 @@ msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
-"Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov "
-"sertifikat, politiku i procedure (ako su dostupni)."
+"Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, "
+"politiku i procedure (ako su dostupni)."
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
@@ -19082,30 +19359,6 @@ msgstr "Unesite lozinku za PKCS12 datoteku:"
 msgid "Imported Certificate"
 msgstr "Uvežen sertifikat"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "Prilog za dodavanje."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Tip sadržaja priloga."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "Ime datoteke koje se prikazuje u poruci."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Opis priloga."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Označi da se prilog podrazumevano prikazuje unutar poruke."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Podrazumevan naslov poruke."
-
 # * found, so just bail completely.
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
@@ -19238,7 +19491,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:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2710
 msgid "Select All"
 msgstr "Izaberi sve"
 
@@ -19313,7 +19566,7 @@ msgstr "Premes_ti kontakt u..."
 msgid "_Move Folder Contacts To"
 msgstr "_Premesti kontakte iz fascikle u"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
@@ -19515,23 +19768,23 @@ msgstr "Zatvori"
 msgid "I_nsert"
 msgstr "_Umetni"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Zatvori"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:44
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Pomoć"
 
@@ -19588,87 +19841,92 @@ msgid "R_ole Field"
 msgstr "_Uloga polje"
 
 #: ../ui/evolution-event-editor.xml.h:16
+#, fuzzy
+msgid "Send _Options"
+msgstr "Opcije slanja"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Bira da li je polje vrsta učesnika prikazano"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Bira da li je polje RSVP prikazano"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Bira da li je polje Uloga prikazano"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Bira da li da prikaže polje sa stanjem"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Bira da li da prikaže vremensku zonu"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Bira da li da prikaže kategorije"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoliti celodnevne događaje"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "Bira da li da prikaže vreme kao zauzeto"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "Ala_rmi"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "Ka_tegorije"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "Ozna_ka"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "Učesta_lost"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "_Stanje polje"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "_Vrsta polje"
 
@@ -19693,79 +19951,92 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Napravi ili uredi pravila za filtriranje nove pošte"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages for Offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
+#, fuzzy
+msgid "Download messages for offline"
+msgstr "Fascikla nije na mreži"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Fas_cikla"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Premesti izabranu fasciklu u drugu fasciklu"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno ukloni sve obrisane poruke iz svih fascikli"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview below the message list"
 msgstr "Prikaži pregled poruke ispod liste poruka"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Show message preview side-by-side with the message list"
 msgstr "Prikaži pregled poruke jedno do drugog sa listom poruka"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "Show message preview window"
 msgstr "Prikaži prozor za pregled poruke"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavi se ili odjavi na fascikle na mrežnim serverima"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Message Filters"
 msgstr "F_ilteri za poruke"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:24
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Preview"
 msgstr "_Pregled"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:30
 msgid "_Subscriptions"
 msgstr "_Prijave"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:31
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
@@ -19840,51 +20111,61 @@ msgid "Permanently remove this folder"
 msgstr "Trajno ukloni ovu fasciklu"
 
 #: ../ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Re_fresh..."
+msgstr "Osveži"
+
+#: ../ui/evolution-mail-list.xml.h:21
+#, fuzzy
+msgid "Refresh the folder"
+msgstr "Osvežavanje fascikle"
+
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select Message _Thread"
 msgstr "Izaberi raspravu"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select _All Messages"
 msgstr "Izaberi _sve poruke"
 
 # bug:
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Izaberi sve i samo poruke koje trenutno nisu izabrane"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Označi sve poruke iste rasprave kao izabranu poruku"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Show Hidde_n Messages"
 msgstr "Pri_kaži skrivene poruke"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Show messages that have been temporarily hidden"
 msgstr "Prikaži poruke koje su privremeno skrivene"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Privremeno sakrij sve pročitane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Temporarily hide the selected messages"
 msgstr "Privremeno sakrij izabrane poruke"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Threaded Message list"
 msgstr "Poruke po raspravama"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "_Group By Threads"
 msgstr "Grupiši po raspravama"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Poruka"
@@ -20187,7 +20468,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "Fascikla pretrage na dopisnu _listu..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
+#, fuzzy
+msgid "Search Folder from Recipien_ts..."
 msgstr "Fascikla pretrage na primaoce..."
 
 #: ../ui/evolution-mail-message.xml.h:88
@@ -20210,7 +20492,7 @@ msgstr "Izaberi _sav tekst"
 msgid "Select all the text in a message"
 msgstr "Izaberi sav tekst u poruci"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
 msgid "Set up the page settings for your current printer"
 msgstr "Podesi stranu za tekući štampač"
 
@@ -20430,144 +20712,169 @@ msgid "PGP Sign"
 msgstr "PGP potpis"
 
 #: ../ui/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "PGP _Encrypt"
+msgstr "PGP šifruj"
+
+#: ../ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "PGP _Sign"
+msgstr "PGP potpis"
+
+#: ../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:18
+#: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "S/MIME En_crypt"
+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:19
+#: ../ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "S/MIME Sig_n"
+msgstr "S/MIME potpis"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME potpis"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "S_end"
+msgstr "Pošalji"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "Sačuvaj kao"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "Sačuvaj pripremu"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "Sačuvaj _kao..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "Sačuvaj _pripremu"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "Sačuvaj kao pripremu"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "Sačuvaj u fasciklu..."
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "Sačuvaj trenutnu datoteku"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "Sačuvaj trenutnu datoteku pod drugim imenom"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "Sačuvaj poruku u navedenoj fascikli"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "Pošalji"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Pošalji poruku u HTML formatu"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "Pošalji ovu poruku"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "Postavi važnost poruke na visoko"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "Potpiši ovu poruku pomoću PGP ključa"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpiši ovu poruku S/MIME sertifikatom"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje BCC prikazano"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Bira da li je polje Šalje prikazano"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Bira da li je polje Pošalji prikazano"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor prikazano"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "Bira da li je polje Prima prikazano"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "Obri_ši sve"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "Š_alje polje"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "_Pošalji polje"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "V_ažnosti poruke"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "Odgo_vor polje"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "_Sigurnost"
 
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "Mog_ućnosti kod slanja"
 
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "_Prima polje"
 
@@ -20756,42 +21063,47 @@ msgid "New _Window"
 msgstr "Nov p_rozor"
 
 #: ../ui/evolution.xml.h:19
+#, fuzzy
+msgid "Page Set_up..."
+msgstr "Podešavanje strane:"
+
+#: ../ui/evolution.xml.h:20
 msgid "Prefere_nces"
 msgstr "Postav_ke"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
 msgid "Send / Receive"
 msgstr "Slanje / primanje"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Send queued items and retrieve new items"
 msgstr "Šalje pripremljene i dovlači nove predmete"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Set up Pilot configuration"
 msgstr "Podešavanje Pilota"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
 msgid "Show Side _Bar"
 msgstr "Prikaži bočnu o_blast"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:27
 msgid "Show _Status Bar"
 msgstr "Prikaži _linija sa stanjem"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
 msgid "Show _Toolbar"
 msgstr "Prikaži _paletu alata"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
 msgid "Submit Bug Report"
 msgstr "Šalje izveštaj o grešci"
 
@@ -20799,71 +21111,71 @@ msgstr "Šalje izveštaj o grešci"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "Pošalji izveštaj o _grešci"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošalji izveštaj o grešci Bubaždajinim pomoćnikom"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Bira da li ćemo raditi van mreže."
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:38
 msgid "Tool_bar style"
 msgstr "Stil pa_lete alata"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:39
 msgid "View/Hide the Side Bar"
 msgstr "Prikaži/Sakrij bočnu oblast"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:40
 msgid "View/Hide the Status Bar"
 msgstr "Prikaži/Sakrij liniju stanja"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:41
 msgid "_About"
 msgstr "_O programu"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:42
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:45
 msgid "_Forget Passwords"
 msgstr "Zaboravi _lozinke"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:47
 msgid "_Hide buttons"
 msgstr "_Sakrij dugmad"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:48
 msgid "_Icons only"
 msgstr "Samo _ikone"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Kratki podsetnik"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Izgled _prebacivača"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Mogućnosti za _usklađivanje..."
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:54
 msgid "_Text only"
 msgstr "Samo _tekst"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "Pro_zor"
 
@@ -20946,11 +21258,11 @@ msgstr "Sa _stanjem"
 # Univerzalno vreme, ili UT
 # Valjda UV?
 #. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
@@ -20979,19 +21291,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:76
+#: ../widgets/menus/gal-define-views-dialog.c:84
 #: ../widgets/menus/gal-define-views-model.c:188
 msgid "Collection"
 msgstr "Zbirka"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../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:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:374
+#: ../widgets/menus/gal-define-views-dialog.c:376
 msgid "Define Views"
 msgstr "Odredi preglede"
 
@@ -21000,12 +21312,8 @@ msgstr "Odredi preglede"
 msgid "Define Views for \"%s\""
 msgstr "Odredi preglede za „%s“"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "_Uredi..."
-
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1909
+#: ../widgets/table/e-table-header-item.c:1912
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -21030,7 +21338,7 @@ 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-menus.c:350
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
@@ -21039,7 +21347,7 @@ msgid "Save Custom View"
 msgstr "Čuva prilagođen pregled"
 
 #: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
@@ -21047,10 +21355,29 @@ msgstr "Odredi preglede..."
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, fuzzy, c-format
+msgid "Select View: %s"
+msgstr "Nedeljni pregled: %s. %s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr ""
+
+#: ../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"
+
+#: ../widgets/menus/gal-view-menus.c:383
+#, fuzzy
+msgid "Create or edit views"
+msgstr "_Napravi novi pregled"
+
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
 msgstr "Proizvodnja"
@@ -21071,6 +21398,33 @@ msgstr "Tip pregleda"
 msgid "Type of view:"
 msgstr "Tip pregleda:"
 
+#: ../widgets/misc/e-attachment-bar.c:1019
+msgid "Attachment Bar"
+msgstr "Linija priloga"
+
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Nije moguće prilaganje datoteke %s: %s"
+
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Nije moguće prilaganje datoteke %s: nije regularna datoteka"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Osobine priloga"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Ime datoteke:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME tip:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatski prikaz priloga"
@@ -21083,8 +21437,8 @@ msgid "MTWTFSS"
 msgstr "PUSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1089
-#: ../widgets/misc/e-calendar-item.c:1743
+#: ../widgets/misc/e-calendar-item.c:1088
+#: ../widgets/misc/e-calendar-item.c:1742
 msgid "%B %Y"
 msgstr "%B %Y."
 
@@ -21093,27 +21447,27 @@ 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:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../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
 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:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../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
 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:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../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
 msgid "Fill stipple"
 msgstr "Istačkaj"
 
@@ -21156,115 +21510,116 @@ msgstr "Najmanja širina"
 msgid "Spacing"
 msgstr "Razmak"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "Sada"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vreme mora biti u formatu: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost postotka mora biti između 0 i 100"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "Baltička"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "Centralnoevropska"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "Kineska"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "Ćirilična"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "Grčka"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "Hebrejska"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "Japanska"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "Korejska"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "Tajvanski"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "Turska"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "Unikod"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "Zapadnoevropska"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "Zapadnoevropska, nova"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "Tradicionalna"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
 #: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Simplified"
 msgstr "Pojednostavljena"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "Vizuelna"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "Kodna strana"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "Izaberite kodnu stranu za korišćenje"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
 #: ../widgets/misc/e-dateedit.c:321
 msgid "Date and Time"
 msgstr "Datum i vreme"
@@ -21286,36 +21641,19 @@ msgstr "Okvir za izbor vremena"
 msgid "Time"
 msgstr "Vreme"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:459
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:465
 msgid "_Today"
 msgstr "_Danas"
 
-# strftime format of a time in 24-hour format,
-# without seconds.
-# This is a strftime() format. %H = hour (0-23), %M = minute.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-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.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: ../widgets/misc/e-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1631
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../widgets/misc/e-dateedit.c:1660
+#: ../widgets/misc/e-dateedit.c:1657
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
@@ -21355,11 +21693,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:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3359
 msgid "Expander Size"
 msgstr "Veličina stabla"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3360
 msgid "Size of the expander arrow"
 msgstr "Veličina strelice stabla"
 
@@ -21372,21 +21710,21 @@ msgid "Spacing around expander arrow"
 msgstr "Razmak oko strelice stabla"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:291 ../widgets/misc/e-filter-bar.c:727
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
+#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:233
 msgid "Save Search"
 msgstr "Sačuvaj pretragu"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:270
 msgid "_Searches"
 msgstr "_Pretrage"
 
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:272
 msgid "Searches"
 msgstr "Pretrage"
 
@@ -21402,31 +21740,35 @@ msgstr "_Uredi sačuvane pretrage..."
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
-msgstr "Svi nalozi"
+msgstr "svim nalozima"
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
-msgstr "Tekući nalog"
+msgstr "tekućem nalogu"
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
-msgstr "Tekuća fascikla"
+msgstr "tekućoj fascikli"
 
+# bug: requires a comment on usage
 #: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Message"
-msgstr "Tekuća poruka"
+msgstr "tekućoj poruci"
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Izaberite sliku"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Karta sveta"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -21458,43 +21800,43 @@ msgstr "Model preispunjavanja"
 msgid "Column width"
 msgstr "Širina kolone"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:596
 msgid "_Search"
 msgstr "_Pretraži"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:602
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Item ID"
 msgstr "IB predmeta"
 
-#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1223
-#: ../widgets/text/e-entry.c:1224 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../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
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:996
+#: ../widgets/misc/e-search-bar.c:999
 msgid "Sho_w: "
 msgstr "Prika_ži: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1016
 msgid "Sear_ch: "
 msgstr "P_retraži"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1025
+#: ../widgets/misc/e-search-bar.c:1028
 msgid " i_n "
 msgstr " _u "
 
@@ -21654,14 +21996,14 @@ msgid "_When opened:"
 msgstr "_Kada je otvoreno:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:219
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
@@ -21694,35 +22036,35 @@ msgstr "iskačuća lista"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:398
+#: ../widgets/table/e-cell-pixbuf.c:387
 msgid "Selected Column"
 msgstr "Izabrana kolona"
 
-#: ../widgets/table/e-cell-pixbuf.c:405
+#: ../widgets/table/e-cell-pixbuf.c:394
 msgid "Focused Column"
 msgstr "Fokusirana kolona"
 
-#: ../widgets/table/e-cell-pixbuf.c:412
+#: ../widgets/table/e-cell-pixbuf.c:401
 msgid "Unselected Column"
 msgstr "Neizabrana kolona"
 
-#: ../widgets/table/e-cell-text.c:1805
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Strikeout Column"
 msgstr "Precrtana kolona"
 
-#: ../widgets/table/e-cell-text.c:1812
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Underline Column"
 msgstr "Podvučena kolona"
 
-#: ../widgets/table/e-cell-text.c:1819
+#: ../widgets/table/e-cell-text.c:1816
 msgid "Bold Column"
 msgstr "Podebljana kolona"
 
-#: ../widgets/table/e-cell-text.c:1826
+#: ../widgets/table/e-cell-text.c:1823
 msgid "Color Column"
 msgstr "Kolona u boji"
 
-#: ../widgets/table/e-cell-text.c:1840
+#: ../widgets/table/e-cell-text.c:1837
 msgid "BG Color Column"
 msgstr "Kolona boja u pozadini"
 
@@ -21737,7 +22079,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:1575
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Ascending"
 msgstr "Rastuće"
 
@@ -21748,7 +22090,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:1575
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Descending"
 msgstr "Opadajuće"
 
@@ -21772,7 +22114,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:563
+#: ../widgets/table/e-table-config.c:643
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Prikaži polja"
@@ -21811,27 +22153,27 @@ msgstr "Prikazana _polja..."
 msgid "_Sort..."
 msgstr "_Razvrstaj..."
 
-#: ../widgets/table/e-table-config.c:150
+#: ../widgets/table/e-table-config.c:154
 msgid "State"
 msgstr "Stanje"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Ascending)"
 msgstr "(Rastuće)"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Descending)"
 msgstr "(Opadajuće)"
 
-#: ../widgets/table/e-table-config.c:314
+#: ../widgets/table/e-table-config.c:394
 msgid "Not sorted"
 msgstr "Nije razvrstano"
 
-#: ../widgets/table/e-table-config.c:355
+#: ../widgets/table/e-table-config.c:435
 msgid "No grouping"
 msgstr "Bez grupisanja"
 
-#: ../widgets/table/e-table-config.c:584
+#: ../widgets/table/e-table-config.c:664
 msgid "Available Fields"
 msgstr "Dostupna polja"
 
@@ -21847,14 +22189,14 @@ msgstr "_Prikaži ova polja po redu:"
 #: ../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:1874
+#: ../widgets/table/e-table-header-item.c:1877
 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:1888
+#: ../widgets/table/e-table-header-item.c:1891
 msgid "Full Header"
 msgstr "Puno zaglavlje"
 
@@ -21903,7 +22245,7 @@ msgstr "Redovi naizmeničnih boja"
 #: ../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:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-tree.c:3312 ../widgets/table/e-tree.c:3313
 msgid "Horizontal Draw Grid"
 msgstr "Položene linije za crtanje"
 
@@ -21912,7 +22254,7 @@ msgstr "Položene linije za crtanje"
 #: ../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:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-tree.c:3318 ../widgets/table/e-tree.c:3319
 msgid "Vertical Draw Grid"
 msgstr "Uspravne linije za crtanje"
 
@@ -21921,7 +22263,7 @@ msgstr "Uspravne linije za crtanje"
 #: ../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:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-tree.c:3324 ../widgets/table/e-tree.c:3325
 msgid "Draw focus"
 msgstr "Središte crtanja"
 
@@ -21946,8 +22288,8 @@ msgstr "Model za izbor"
 #: ../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:3309 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3307
 msgid "Length Threshold"
 msgstr "Najveća dužina"
 
@@ -21956,8 +22298,8 @@ msgstr "Najveća dužina"
 #: ../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:3316 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Uniform row height"
 msgstr "Ujednačena visina redova"
 
@@ -21968,70 +22310,81 @@ msgstr "Ujednačena visina redova"
 msgid "Frozen"
 msgstr "Zamrznuto"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1457
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../widgets/table/e-table-header-item.c:1473
-msgid "Sort Ascending"
+#: ../widgets/table/e-table-header-item.c:1477
+#, fuzzy
+msgid "Sort _Ascending"
 msgstr "Rastuće razvrstavanje"
 
-#: ../widgets/table/e-table-header-item.c:1474
-msgid "Sort Descending"
+#: ../widgets/table/e-table-header-item.c:1478
+#, fuzzy
+msgid "Sort _Descending"
 msgstr "Opadajuće razvrstavanje"
 
-#: ../widgets/table/e-table-header-item.c:1475
-msgid "Unsort"
+#: ../widgets/table/e-table-header-item.c:1479
+#, fuzzy
+msgid "_Unsort"
 msgstr "Ne razvrstavaj"
 
-#: ../widgets/table/e-table-header-item.c:1477
-msgid "Group By This Field"
+#: ../widgets/table/e-table-header-item.c:1481
+#, fuzzy
+msgid "Group By This _Field"
 msgstr "Grupiši po ovome polju"
 
-#: ../widgets/table/e-table-header-item.c:1478
-msgid "Group By Box"
+#: ../widgets/table/e-table-header-item.c:1482
+#, fuzzy
+msgid "Group By _Box"
 msgstr "Grupiši po okviru"
 
-#: ../widgets/table/e-table-header-item.c:1480
-msgid "Remove This Column"
+#: ../widgets/table/e-table-header-item.c:1484
+#, fuzzy
+msgid "Remove This _Column"
 msgstr "Ukloni ovu kolonu"
 
-#: ../widgets/table/e-table-header-item.c:1481
-msgid "Add a Column..."
+#: ../widgets/table/e-table-header-item.c:1485
+#, fuzzy
+msgid "Add a C_olumn..."
 msgstr "Dodaj kolonu..."
 
-#: ../widgets/table/e-table-header-item.c:1483
-msgid "Alignment"
+#: ../widgets/table/e-table-header-item.c:1487
+#, fuzzy
+msgid "A_lignment"
 msgstr "Poravnanje"
 
-#: ../widgets/table/e-table-header-item.c:1484
-msgid "Best Fit"
+#: ../widgets/table/e-table-header-item.c:1488
+#, fuzzy
+msgid "B_est Fit"
 msgstr "Najbolje uklapanje"
 
-#: ../widgets/table/e-table-header-item.c:1485
-msgid "Format Columns..."
+#: ../widgets/table/e-table-header-item.c:1489
+#, fuzzy
+msgid "Format Column_s..."
 msgstr "Formatiraj kolone..."
 
-#: ../widgets/table/e-table-header-item.c:1487
-msgid "Customize Current View..."
+#: ../widgets/table/e-table-header-item.c:1491
+#, fuzzy
+msgid "Custo_mize Current View..."
 msgstr "Prilagodi trenutni pregled..."
 
-#: ../widgets/table/e-table-header-item.c:1536
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Sort By"
 msgstr "Poredaj po"
 
-#: ../widgets/table/e-table-header-item.c:1881
+#: ../widgets/table/e-table-header-item.c:1884
 msgid "Font Description"
 msgstr "Opis fonta"
 
-#: ../widgets/table/e-table-header-item.c:1902
+#: ../widgets/table/e-table-header-item.c:1905
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Detalji razvrstavanja"
 
-#: ../widgets/table/e-table-header-item.c:1916
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1919
+#: ../widgets/table/e-tree-scrolled.c:231
+#: ../widgets/table/e-tree-scrolled.c:232
 msgid "Tree"
 msgstr "Stablo"
 
@@ -22047,159 +22400,485 @@ msgstr "Model tabele"
 msgid "Cursor row"
 msgstr "Red kursora"
 
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3346
 msgid "Always search"
 msgstr "Uvek pretraži"
 
-#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-table.c:3333
 msgid "Use click to add"
 msgstr "Koristite klik da dodate"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3331 ../widgets/table/e-tree.c:3332
 msgid "ETree table adapter"
 msgstr "ETree prilagođivač tabele"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3352
 msgid "Retro Look"
 msgstr "Starinski izgled"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3353
 msgid "Draw lines and +/- expanders."
 msgstr "Iscrtava linije i +/- graničnike."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Proba minikarte"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Autorsko pravo (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "Ovo isprobava polje minikarte"
-
-#: ../widgets/text/e-entry.c:1216 ../widgets/text/e-entry.c:1217
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
+#: ../widgets/text/e-text.c:3475 ../widgets/text/e-text.c:3476
 msgid "Event Processor"
 msgstr "Obrađivač događaja"
 
-#: ../widgets/text/e-entry.c:1230 ../widgets/text/e-entry.c:1231
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Justification"
 msgstr "Obostrano"
 
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Use ellipsis"
 msgstr "Koristi tri tačke"
 
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "Ellipsis"
 msgstr "Tri tačke"
 
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Line wrap"
 msgstr "Prelom reda"
 
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
+#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
 msgid "Break characters"
 msgstr "Znaci za prelom"
 
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
+#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
 msgid "Max lines"
 msgstr "Najviše linija"
 
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
+#: ../widgets/text/e-text.c:3668 ../widgets/text/e-text.c:3669
 msgid "Allow newlines"
 msgstr "Dozvoli nove linije"
 
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
+#: ../widgets/text/e-text.c:3661 ../widgets/text/e-text.c:3662
 msgid "Draw borders"
 msgstr "Iscrtaj ivice"
 
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
 msgid "Draw background"
 msgstr "Iscrtaj pozadinu"
 
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
 msgid "Draw button"
 msgstr "Iscrtaj dugme"
 
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
 msgid "Cursor position"
 msgstr "Pozicija kurzora"
 
-#: ../widgets/text/e-entry.c:1342 ../widgets/text/e-entry.c:1343
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 msgid "Emulate label resize"
 msgstr "Oponašaj promenu veličine oznake"
 
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2722
 msgid "Input Methods"
 msgstr "Metodi unosa"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 msgid "Strikeout"
 msgstr "Precrtano"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3503 ../widgets/text/e-text.c:3504
 msgid "Anchor"
 msgstr "Veza"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Clip Width"
 msgstr "Iseci širinu"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Clip Height"
 msgstr "Iseci visinu"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
 msgid "Clip"
 msgstr "Iseci"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
 msgid "Fill clip rectangle"
 msgstr "Ispuni pravougaonik isečka"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
 msgid "X Offset"
 msgstr "X pomeranje"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
 msgid "Y Offset"
 msgstr "Y pomeranje"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3590
 msgid "Text width"
 msgstr "Širina teksta"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
 msgid "Text height"
 msgstr "Visina teksta"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
 msgid "IM Context"
 msgstr "Kontekst metoda unosa"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Handle Popup"
 msgstr "Upravljaj iskačućim prozorom"
 
+#~ msgid "_Address: "
+#~ msgstr "_Adresa:"
+
+#~ msgid "Print cards"
+#~ msgstr "Štampaj karte"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacija"
+
+#~ msgid "E-mail"
+#~ msgstr "E-pošta"
+
+#~ msgid "GTK Tree View"
+#~ msgstr "Pregled GTK stabla"
+
+#~ msgid "Print envelope"
+#~ msgstr "Štampaj kovertu"
+
+#~ msgid "Print contacts"
+#~ msgstr "Štampaj kontakte"
+
+#~ msgid "Print contact"
+#~ msgstr "Štampaj kontakt"
+
+#~ msgid "Error loading default addressbook."
+#~ msgstr "Greška pri učitavanju podrazumevanog imenika."
+
+#~ msgid "Input File"
+#~ msgstr "Ulazna datoteka"
+
+#~ msgid "No filename provided."
+#~ msgstr "Ime datoteke nije dato."
+
+#~ msgid "Add Calendar"
+#~ msgstr "Dodaje kalendar"
+
+#~ msgid "Add Task List"
+#~ msgstr "Dodaje listu zaduženja"
+
+#~ msgid "_Add Calendar"
+#~ msgstr "_Dodaj kalendar"
+
+#~ msgid "_Add Task List"
+#~ msgstr "_Dodaj listu zaduženja"
+
+#~ msgid "Add New Calendar"
+#~ msgstr "Dodaj novi kalendar"
+
+#~ msgid "Calendar Group"
+#~ msgstr "Grupa kalendara"
+
+#~ msgid "Calendar Location"
+#~ msgstr "Mesto kalendara"
+
+#~ msgid "Calendar Name"
+#~ msgstr "Ime kalendara"
+
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>Opcije liste zaduženja</b>"
+
+#~ msgid "Add New Task List"
+#~ msgstr "Dodaj novu listu zaduženja"
+
+#~ msgid "Task List Group"
+#~ msgstr "Grupa za liste zaduženja"
+
+#~ msgid "Task List Name"
+#~ msgstr "Ime liste zaduženja"
+
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>K_alendari za slobodno/zauzeto</b>"
+
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>Učestalost objavljivanja</b>"
+
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>_Mesto objavljivanja</b>"
+
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Podešavanja objavljivanja slobodno/zauzeto"
+
+#~ msgid "_Daily"
+#~ msgstr "_Dnevno"
+
+#~ msgid "_Manual"
+#~ msgstr "_Ručno"
+
+#~ msgid "_Weekly"
+#~ msgstr "_Nedeljno"
+
+#~ msgid "Enter the password for %s"
+#~ msgstr "Unesite lozinku za %s"
+
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "Izabrani dan (%a, %d. %b %Y.)"
+
+#~ msgid "%a %b %d"
+#~ msgstr "%a, %d. %b"
+
+#~ msgid "%a %d %Y"
+#~ msgstr "%a, %d. %Y."
+
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a, %d. %b %Y."
+
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "Izabrana nedelja (%s - %s)"
+
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "Izabrani mesec (%b %Y)"
+
+#~ msgid "Selected year (%Y)"
+#~ msgstr "Izabrana godina (%Y)"
+
+#~ msgid "Print Item"
+#~ msgstr "Štampaj predmet"
+
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+
+#~ msgid "No, Do not Change Status"
+#~ msgstr "Ne, ne menjaj stanje"
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>Primanje pošte</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>Slanje pošte:</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>Ova strana dozvoljava da izaberete da li želite da pošaljete "
+#~ "priznanicu uz svoju\n"
+#~ "poruku radi obaveštenja kada bude pročitana, i da odredite šta Evolucija "
+#~ "da radi kada neko Vama pošalje priznanicu.</small>"
+
+#~ msgid "Always send back a read receipt"
+#~ msgstr "Uvek vrati priznanicu"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "Pitaj me želim li da vratim priznanicu"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "Nikada ne vraćaj priznanicu"
+
+#~ msgid "Read Receipts"
+#~ msgstr "Priznanice"
+
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "Zatraži povraćaj priznanice za sve poruke koje pošaljem"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "Osim ako je poruka poslata dopisnoj listi, a ne meni lično"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr "Kada primite poruku sa priznanicom, šta Evolucija da radi?"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Položaj zone."
+
+#~ msgid "Enable"
+#~ msgstr "Omogući"
+
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "Filter važnosti „%s“"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "Neki od Netscape filtera za poštu zasnovani su\n"
+#~ "na prioritetima koje Evolucija ne koristi.\n"
+#~ "Umesto toga Evolucija daje rezultate u rasponu od\n"
+#~ "-3 do 3 koji se dodeljuju porukama i u skladu sa time\n"
+#~ "filtriraju.\n"
+#~ "\n"
+#~ "Kao privremeno rešenje, dodata je grupa filtera imena \n"
+#~ "„Prioritetni filter“ koja pretvara Netscape filtere za poštu u\n"
+#~ "rezultate Evolucije, a promenjeni filteri koriste rezultate umesto\n"
+#~ "prioriteta. Proverite uvežene filtere da se uverite\n"
+#~ "da li sve radi kao što bi trebalo."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "Neki od Netscape filtera za poštu koriste\n"
+#~ "mogućnost „Zanemari raspravu“ ili „Prati raspravu“\n"
+#~ "koju Evolucija ne podržava.\n"
+#~ "Ovi filteri će biti izostavljeni."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "Neki od Netscape filtera za poštu proveravaju\n"
+#~ "da li u telu poruka postoji (ne)jednakost za dati niz,\n"
+#~ "što Evolucija ne podržava. Ovi filteri\n"
+#~ "su promenjeni da proveravaju da li taj niz jeste\n"
+#~ "ili nije sadržan u telu poruke."
+
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Evolucija uvozi stare Netscape podatke"
+
+#~ msgid "Importing Netscape data"
+#~ msgstr "Uvoženje Netscape podataka"
+
+#~ msgid "Settings"
+#~ msgstr "Podešavanja"
+
+#~ msgid "Mail Filters"
+#~ msgstr "Filteri pošte"
+
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolucija je pronašla Netscape datoteke pošte.\n"
+#~ "Želite li da budu uvežene u Evoluciju?"
+
+#~ msgid "<span weight=\"bold\">Filter Options</span>"
+#~ msgstr "<span weight=\"bold\">Mogućnosti filtera</span>"
+
+#~ msgid "<b>Recipients </b>"
+#~ msgstr "<b>Primaoci</b>"
+
+#~ msgid "<b>Action</b>"
+#~ msgstr "<b>Radnja</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Datum i vreme</b>"
+
+#~ msgid "No output directory!"
+#~ msgstr "Nema izlazne/krajnje fascikle!"
+
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr ""
+#~ "Izlazna fascikla nije pronađena na iPod uređaju! Molim proverite da li je "
+#~ "džepni uređaj pravilno podešen i pokušajte ponovo."
+
+#~ msgid "Could not export data!"
+#~ msgstr "Nije moguć izvoz podataka!"
+
+#~ msgid "Exporting data failed."
+#~ msgstr "Neuspešan izvoz podataka."
+
+#~ msgid "Could not open addressbook!"
+#~ msgstr "Nije moguće otvoriti imenik!"
+
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "Ne mogu da otvorim Evolucijin imenik kako bi izvezao podatke."
+
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "Ne mogu otvoriti kalendar/spisak obaveza"
+
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr ""
+#~ "Ne mogu otvoriti Evolucijin kalendar/spisak za uraditi da bi izvezao "
+#~ "podatke."
+
+#~ msgid "New mail notify"
+#~ msgstr "Obaveštenje o novoj pošti"
+
+#~ msgid "(Untitled)"
+#~ msgstr "(Neimenovano)"
+
+#~ msgid "An attachment to add."
+#~ msgstr "Prilog za dodavanje."
+
+#~ msgid "Content type of the attachment."
+#~ msgstr "Tip sadržaja priloga."
+
+#~ msgid "The filename to display in the mail."
+#~ msgstr "Ime datoteke koje se prikazuje u poruci."
+
+#~ msgid "Description of the attachment."
+#~ msgstr "Opis priloga."
+
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "Označi da se prilog podrazumevano prikazuje unutar poruke."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Uredi..."
+
+#~ msgid "..."
+#~ msgstr "..."
+
+# 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"